[SCM] deadbeef/master: Imported Upstream version 0.6.2

mati75-guest at users.alioth.debian.org mati75-guest at users.alioth.debian.org
Sat Aug 9 15:02:19 UTC 2014


The following commit has been merged in the master branch:
commit 123de8361eaf240057f334ddae1961dd92078d9a
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Sat Aug 9 16:59:48 2014 +0200

    Imported Upstream version 0.6.2

diff --git a/COPYING b/COPYING
index 59a07f8..6258f8c 100644
--- a/COPYING
+++ b/COPYING
@@ -1 +1,123 @@
-see COPYING.GPLv2 and COPYING.LGPLv2.1 files
+DeaDBeeF Player and DeaDBeeF Plugin SDK
+Copyright (C) 2009-2014 Alexey Yakovenko and contributors
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+DeaDBeeF Plugins
+
+For plugin copying information, please see COPYING in plugin subdirectory.
+
+
+
+utf8.c, utf8.h
+Based on Basic UTF-8 manipulation routines by Jeff Bezanson
+Copyright © Jeff Bezanson
+placed in the public domain Fall 2005
+
+
+
+fastftoi.h based on libvorbis/vorbis/lib/os.h
+Copyright (c) 2002-2008 Xiph.org Foundation
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+fft.c, fft.h
+Copyright 2011 John Lindgren
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions, and the following disclaimer in the documentation
+   provided with the distribution.
+
+This software is provided "as is" and without any warranty, express or
+implied. In no event shall the authors be liable for any damages arising from
+the use of this software.
+
+
+
+md5/md5.c, md5/md5.h
+Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+L. Peter Deutsch
+ghost at aladdin.com
+
+
+
+ConvertUTF/ConvertUTF.c, ConvertUTF/ConvertUTF.h
+Copyright 2001-2004 Unicode, Inc.
+
+Disclaimer
+
+This source code is provided as is by Unicode, Inc. No claims are
+made as to fitness for any particular purpose. No warranties of any
+kind are expressed or implied. The recipient agrees to determine
+applicability of information provided. If this file has been
+purchased on magnetic or optical media from Unicode, Inc., the
+sole remedy for any claim will be exchange of defective media
+within 90 days of receipt.
+
+Limitations on Rights to Redistribute This Code
+
+Unicode, Inc. hereby grants the right to freely use the information
+supplied in this file in the creation of products supporting the
+Unicode Standard, and to make copies of this file in any form
+for internal or external distribution as long as this notice
+remains attached.
diff --git a/ChangeLog b/ChangeLog
index ca262e7..0a33924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,103 @@
+version 0.6.2
+	added "Stop playback after current album finished" (Aleksejs Popovs)
+	added ALAC, OPUS, OggFlac encoder presets (Ian Nartowicz)
+	added configure option to build artwork plugin without network support
+	added new widget for muting chiptune voices
+	added support for SHIFT-JIS charset detection/recoding (off by default)
+	fixed "stop after current" bug, which required player restart on every change
+	fixed --gui command line option
+	fixed GUI seeking accuracy bug
+	fixed bug in extended frame flags conversion between ID3v2.3 and ID3v2.4 tag formats
+	fixed crash when loading playlist from command line
+	fixed loading album art (APIC frame) from ID3v2.4 with data length indicator
+	fixed non-utf8 locale support in console
+	fixed support for vorbis files with more than 6 channels
+	fixed playlist count limit bug
+	fixed preserving file permissions after editing ogg files
+	fixed several bugs in PLS playlist format support
+	improved FreeBSD and OSX support
+	improved charset detection in CUE and ID3v1
+	improved album art column rendering/resizing (Christian Boxdörfer)
+	improved the build system and the output build quality
+	improved detection of config changes, to avoid unnecessary config writing
+	improved support for reading APEv2 and ID3v1 tags from large files (>2Gb)
+	updated licensing information in all plugins, to include information about all used libraries
+	aac: added workaround for 7 channel sound playback bug
+	ape: play files with format >= 4.11, improved error handling
+	artwork: many fixes and improvements, including support for non-tagged files
+	dumb: added option to configure internal volume
+	ffmpeg: fixed bitrate calculation
+	ffmpeg: fixed replaygain support
+	flac: fixed/improved many things in tag reading and writing code
+	gme: added support for loading gzipped modules from supported archives (e.g. from zips)
+	gtkui, pltbrowser: better accessibility
+	gtkui: added option to disable seekbar overlay
+	gtkui: added option to display playback state as unicode characters, instead of bitmaps (works better on HDPI screens)
+	gtkui: added support for design mode to more widgets (seekbak, volumebar, playback toolbar)
+	gtkui: fixed bug in gtk_drag_check_threshold handler
+	gtkui: numerous fixes in widget layout code
+	gtkui: single/double clicking on album art column will select/play the album/group (Christian Boxdörfer)
+	lastfm: added support for scrobbling radio streams (off by default)
+	lastfm: added support for scrobbling tracks shorter than 30 sec (off by default)
+	lastfm: improved support for musicbrainz track id
+	mms: fixed few buffer overflow bugs, improved responsiveness
+	mp3: optimized scanner: less backward seeks during frame syncing
+	shellexec: fixed escaping of single quotes, prevent opening copies of shxui dialogs
+	vfs_zip: huge speed improvements
+	vorbis, oggflac: new tagging code (Ian Nartowicz)
+	improved plugin duplicate checking
+	fixed RIFF WAVE header writing in converter
+	fixed 8bit png crash in album art plugin (Ian Nartowicz)
+	static builds now use -O3 -D_FORTIFY_SOURCE=0 compiler flags
+	fixed few issues with implementation of the Play button
+	improved tag writing in converter
+	fixed issues with "background jobs are running" warning
+	changed all wiki links to point to the new wiki on github
+	improved streamer event handling, to make the GUI more responsive and stable
+	fixed cleaning up downloaded temporary playlist files
+	Fixed skipping bad FLAC__METADATA_TYPE_CUESHEET blocks in FLAC
+	added support for uppercase .CUE extension
+	added "mpga" extension support (mp3)
+	fixed seeking backwards using hotkeys when in the beginning of a track
+
+version 0.6.1
+	fixed crash in AAC plugin when mp4 file reports 0 samples (e.g. radio rips)
+	fixed libsupc++ linking issues
+	fixed support for gcc<4.5
+	changed description of hotkeys plugin in configure
+	fixed 100% CPU load issues with certain hotkeys
+	fixed opening files from command line into default playlist
+	don't allow spawning multiple instances of converter
+	fixed EQ drawing past the bottom margin
+	fixed progress dialog while loading playlists
+	fixed M3UINF parser
+	reverted MP3 bugfixes which introduced incorrect duration calculation
+	fixed ungrabbing deleted global hotkeys
+	added config option to help debug buffering/streaming
+	ffmpeg plugin can now handle dynamic data format changes
+	fixed rare buffering problem which was causing stuttering for some users
+	fixed running without X and/or without GUI plugin
+	fixed mp3 duration rounding bug
+	fixed incorrect scroll/cursor after deleting playlists
+	added support for loading plugins from ~/.local/lib{32|64}/deadbeef, depending on running deadbeef build version
+	fixed bug imposing 256 byte limit on file pathes in archives
+	fixed column autoresize issues
+	removed libstdc++ hacks from C++ plugins
+	fixed "Remove from disk" menu item not being hidden by corresponding option
+	fixed applying "Pin group titles" config on startup (patch from Christian Boxdörfer)
+	improved charset detection in CUE files, not longer allowing invalid utf-8 to go through
+	paused network streams don't attempt to prebuffer until played
+	unpausing network streams always restarts them
+	prevent loading playlists from archives (treat them like folders)
+	hide the "Hotkeys" tab from preferences if hotkeys plugin is not available
+	don't build shellexecui if not building shellexec
+	fixed memleak when drag-dropping pls/m3u playlists from file managers
+	prevent passing non-utf8 filenames to progress dialog
+	fixed crash when opening invalid VTX files
+	fixed crash when opening invalid WMA files
+	don't delete replaygain info from FLACs when writing tags
+	fixed really old buffer overflow bug in dnd handler (kudos to Megabaks)
+
 version 0.6.0
 	gui layout designer, with a set of widgets to choose from (View -> Design mode, then use right click)
 	new API for creating GUI extension plugins
diff --git a/INSTALL b/INSTALL
index 2550dab..2099840 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,19 +1,25 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@ may remove or edit it.
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@ The simplest way to compile this package is:
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@ same time, by placing the object files for each architecture in their
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@ Installation Names
    By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix.
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -163,6 +226,11 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -241,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -288,7 +357,7 @@ operates.
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.
 
@@ -299,4 +368,3 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-
diff --git a/Makefile.am b/Makefile.am
index 6628644..10ad52f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ deadbeef_SOURCES =\
 	volume.c volume.h\
 	junklib.h junklib.c utf8.c utf8.h\
 	u8_lc_map.h\
-	optmath.h\
+	fastftoi.h\
 	vfs.c vfs.h vfs_stdio.c\
 	md5/md5.c md5/md5.h\
 	metacache.c metacache.h\
@@ -39,7 +39,8 @@ deadbeef_SOURCES =\
 	replaygain.c replaygain.h\
 	fft.c fft.h\
 	handler.c handler.h\
-	strdupa.h
+	strdupa.h\
+	escape.c escape.h
 	
 #	ConvertUTF/ConvertUTF.c ConvertUTF/ConvertUTF.h
 
diff --git a/Makefile.in b/Makefile.in
index ab19b98..59b5359 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,23 +17,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -55,13 +82,13 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = deadbeef$(EXEEXT)
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(sdk_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(srcdir)/deadbeef.desktop.in \
-	$(top_srcdir)/configure $(top_srcdir)/intl/Makefile.in \
-	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS compile \
-	config.guess config.rpath config.sub depcomp install-sh \
-	ltmain.sh missing
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in $(top_srcdir)/intl/Makefile.in \
+	$(srcdir)/deadbeef.desktop.in ABOUT-NLS depcomp $(sdk_HEADERS) \
+	COPYING compile config.guess config.rpath config.sub \
+	install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -101,33 +128,59 @@ am_deadbeef_OBJECTS = main.$(OBJEXT) plugins.$(OBJEXT) \
 	junklib.$(OBJEXT) utf8.$(OBJEXT) vfs.$(OBJEXT) \
 	vfs_stdio.$(OBJEXT) md5.$(OBJEXT) metacache.$(OBJEXT) \
 	ringbuf.$(OBJEXT) dsppreset.$(OBJEXT) replaygain.$(OBJEXT) \
-	fft.$(OBJEXT) handler.$(OBJEXT)
+	fft.$(OBJEXT) handler.$(OBJEXT) escape.$(OBJEXT)
 deadbeef_OBJECTS = $(am_deadbeef_OBJECTS)
 am__DEPENDENCIES_1 =
 deadbeef_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) plugins/libparser/libparser.a
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(deadbeef_SOURCES)
 DIST_SOURCES = $(deadbeef_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -164,11 +217,33 @@ DATA = $(desktop_DATA) $(docs_DATA)
 HEADERS = $(sdk_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -179,6 +254,7 @@ am__remove_distdir = \
       && rm -rf "$(distdir)" \
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -206,6 +282,7 @@ am__relativize = \
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
+DIST_TARGETS = dist-bzip2 dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -233,6 +310,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -253,10 +331,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -279,6 +359,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -332,6 +413,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -350,6 +432,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -375,13 +459,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -390,7 +478,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -477,7 +567,7 @@ deadbeef_SOURCES = \
 	volume.c volume.h\
 	junklib.h junklib.c utf8.c utf8.h\
 	u8_lc_map.h\
-	optmath.h\
+	fastftoi.h\
 	vfs.c vfs.h vfs_stdio.c\
 	md5/md5.c md5/md5.h\
 	metacache.c metacache.h\
@@ -487,7 +577,8 @@ deadbeef_SOURCES = \
 	replaygain.c replaygain.h\
 	fft.c fft.h\
 	handler.c handler.h\
-	strdupa.h
+	strdupa.h\
+	escape.c escape.h
 
 
 #	ConvertUTF/ConvertUTF.c ConvertUTF/ConvertUTF.h
@@ -547,8 +638,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -573,10 +664,12 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -597,7 +690,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -610,9 +704,10 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 deadbeef$(EXEEXT): $(deadbeef_OBJECTS) $(deadbeef_DEPENDENCIES) $(EXTRA_deadbeef_DEPENDENCIES) 
 	@rm -f deadbeef$(EXEEXT)
-	$(LINK) $(deadbeef_OBJECTS) $(deadbeef_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(deadbeef_OBJECTS) $(deadbeef_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -622,6 +717,7 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/conf.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dsppreset.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/escape.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fft.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/handler.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/junklib.Po at am__quote@
@@ -644,39 +740,39 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/volume.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 md5.o: md5/md5.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.o -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.o `test -f 'md5/md5.c' || echo '$(srcdir)/'`md5/md5.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='md5/md5.c' object='md5.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.o -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.o `test -f 'md5/md5.c' || echo '$(srcdir)/'`md5/md5.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='md5/md5.c' object='md5.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.o `test -f 'md5/md5.c' || echo '$(srcdir)/'`md5/md5.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.o `test -f 'md5/md5.c' || echo '$(srcdir)/'`md5/md5.c
 
 md5.obj: md5/md5.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.obj -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.obj `if test -f 'md5/md5.c'; then $(CYGPATH_W) 'md5/md5.c'; else $(CYGPATH_W) '$(srcdir)/md5/md5.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='md5/md5.c' object='md5.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.obj -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.obj `if test -f 'md5/md5.c'; then $(CYGPATH_W) 'md5/md5.c'; else $(CYGPATH_W) '$(srcdir)/md5/md5.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='md5/md5.c' object='md5.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.obj `if test -f 'md5/md5.c'; then $(CYGPATH_W) 'md5/md5.c'; else $(CYGPATH_W) '$(srcdir)/md5/md5.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.obj `if test -f 'md5/md5.c'; then $(CYGPATH_W) 'md5/md5.c'; else $(CYGPATH_W) '$(srcdir)/md5/md5.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -751,22 +847,25 @@ uninstall-sdkHEADERS:
 	dir='$(DESTDIR)$(sdkdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -781,57 +880,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -847,12 +901,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -864,15 +913,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -881,9 +926,31 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -951,40 +1018,41 @@ distdir: $(DISTFILES)
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -995,8 +1063,6 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.lz*) \
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
@@ -1008,19 +1074,20 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
 	    --with-included-gettext \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1043,7 +1110,7 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -1187,14 +1254,13 @@ ps-am:
 uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
 	uninstall-docsDATA uninstall-sdkHEADERS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) all install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags ctags-recursive dist \
-	dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar \
-	dist-tarZ dist-xz dist-zip distcheck distclean \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-binPROGRAMS \
+	clean-cscope clean-generic clean-libtool cscope cscopelist-am \
+	ctags ctags-am dist dist-all dist-bzip2 dist-gzip dist-lzip \
+	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
 	distclean-compile distclean-generic distclean-hdr \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
@@ -1207,9 +1273,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
 	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-desktopDATA uninstall-docsDATA \
-	uninstall-sdkHEADERS
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-desktopDATA uninstall-docsDATA uninstall-sdkHEADERS
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/README b/README
index 165ef85..9416b4d 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 TABLE OF CONTENTS
 
 1. compiling, dependencies, etc
-2. information for distributors
+2. licensing
 
 ==========================================================
 
@@ -28,10 +28,8 @@ most of them are optional, which means deadbeef will build and run without them,
 
     libsamplerate: for dsp_libsrc plugin (resampler)
     gtk+-2.0 >= 2.12 (+ gthread, + glib): GTK+ 2.0 user interface
-    libsm: optional dependency for gtkui session client support
-    libice: optional dependency for gtkui session client support
     alsa-lib: ALSA support
-    libvorbis and libogg: for ogg vorbis plugin
+    libvorbis and libogg: for ogg vorbis plugin, and for ogg container metadata in other formats, such as OggFlac
     libcurl >= 7.10: for last.fm, vfs_curl (shoutcast/icecast), artwork plugins
     imlib2: for artwork plugin; see libjpeg and libpng below
     libjpeg and libpng: for artwork plugin (when imlib2 is not installed, or --disable-artwork-imlib2 is used)
@@ -40,7 +38,7 @@ most of them are optional, which means deadbeef will build and run without them,
     wavpack: for wavpack plugin
     libsndfile: for sndfile plugin
     libcdio + libcddb: for cd audio plugin
-    ffmpeg < 0.11: for ffmpeg plugin (versions >= 0.11 are not supported)
+    ffmpeg: for ffmpeg plugin
     xlib: for global hotkeys and gtkui
     dbus: for notification daemon support (OSD current song notifications)
     pulseaudio: for PulseAudio output plugin
@@ -51,10 +49,7 @@ most of them are optional, which means deadbeef will build and run without them,
 
 actual package names for your Linux distribution may vary.
 
-==========================================================
-
-2. information for distributors
 
-The Deadbeef player code is licensed under GPLv2, but this is not a requirement for plugins.
-Plugins don't link directly to deadbeef code, but are using special API header file which uses ZLib license.
+2. licensing
 
+DeaDBeeF core uses ZLIB license. See COPYING in each subdirectory for details.
diff --git a/about.txt b/about.txt
index 8cb2491..39f2342 100644
--- a/about.txt
+++ b/about.txt
@@ -1,25 +1,7 @@
-DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-Copyright © 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+DeaDBeeF - The Ultimate Music Player
+Copyright © 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
 http://deadbeef.sf.net
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-
-Note that other included libraries and plugins may have separate licensing terms.
-
-
 Contributors:
 
     Alexey A. Smirnov <alexey.smirnov at gmx.com>
@@ -46,6 +28,7 @@ Contributors:
         Christian Boxdörfer <christian.boxdoerfer at posteo.de>
         David Bryant <david at wavpack.com>
         Derreck <sarumyanxxl at users.sourceforge.net>
+        Ian Nartowicz
         Igor Murzov <igor at gplsoft.org>
         Igor Rudchenko <igor at thinkpads.net>
         Jan D. Behrens <zykure at web.de>
@@ -64,7 +47,7 @@ Special Thanks To:
     Jan Marguc
     Olga Belozerova
 
-    and to all the people and anonymous creatures hanging at deadbeef-ru at cjr and #deadbeef-player
+    and to all the people and anonymous creatures hanging at #deadbeef-player and #deadbeef-ru
 
 
 Bundled libraries:
@@ -76,7 +59,7 @@ Copyright © 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
 FFT Implementation from Audacious player
 Copyright © 2011 John Lindgren
 
-Optimized math routines from libvorbis
+Fast FTOI routines from libvorbis
 Copyright © 2002-2008 Xiph.org Foundation
 
 The UTF-8 code is based on Basic UTF-8 manipulation routines by Jeff Bezanson
diff --git a/aclocal.m4 b/aclocal.m4
index 8f82519..5cf4e6f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,13 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
 [m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # serial 1 (pkg-config-0.24)
@@ -180,25 +180,22 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.6], [],
+m4_if([$1], [1.14.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -214,24 +211,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -250,7 +245,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -276,22 +271,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -310,16 +302,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -329,7 +319,7 @@ fi])])
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -342,12 +332,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -355,8 +346,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -396,16 +387,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -414,8 +405,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -423,7 +414,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -471,7 +462,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -481,9 +472,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
@@ -498,20 +493,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -524,7 +517,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -536,21 +529,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -568,7 +559,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -578,18 +569,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 16
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -602,7 +596,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -631,31 +625,40 @@ AC_SUBST([CYGPATH_W])
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -666,34 +669,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake at gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -715,15 +762,12 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -737,16 +781,14 @@ if test x"${install_sh}" != xset; then
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -763,20 +805,17 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # AM_MAINTAINER_MODE([DEFAULT-MODE])
 # ----------------------------------
 # Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
 # can override the default with the --enable/--disable switch.
 AC_DEFUN([AM_MAINTAINER_MODE],
 [m4_case(m4_default([$1], [disable]),
@@ -787,10 +826,11 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      [USE_MAINTAINER_MODE=$enableval],
-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+      am_maintainer_other[ make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer])],
+    [USE_MAINTAINER_MODE=$enableval],
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
   AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
   MAINT=$MAINTAINER_MODE_TRUE
@@ -798,18 +838,14 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 ]
 )
 
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -827,7 +863,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -854,15 +890,12 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -870,11 +903,10 @@ AC_DEFUN([AM_MISSING_PROG],
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -887,29 +919,32 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_MKDIR_P
 # ---------------
-# Check for `mkdir -p'.
+# Check for 'mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
 [AC_PREREQ([2.60])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl FIXME we are no longer going to remove this! adjust warning
+dnl FIXME message accordingly.
+AC_DIAGNOSE([obsolete],
+[$0: this macro is deprecated, and will soon be removed.
+You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead,
+and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.])
 dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
 dnl while keeping a definition of mkdir_p for backward compatibility.
 dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
@@ -926,15 +961,12 @@ esac
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
@@ -944,7 +976,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 # --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
 # ------------------------
@@ -958,13 +990,58 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_RUN_LOG(COMMAND)
 # -------------------
@@ -979,22 +1056,16 @@ AC_DEFUN([AM_RUN_LOG],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -1005,32 +1076,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$[2]" = conftest.file
    )
 then
@@ -1040,46 +1119,118 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -1093,18 +1244,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -1114,76 +1263,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
diff --git a/conf.c b/conf.c
index 796615b..110bf4e 100644
--- a/conf.c
+++ b/conf.c
@@ -125,19 +125,26 @@ conf_load (void) {
 int
 conf_save (void) {
     extern char dbconfdir[1024]; // $HOME/.config/deadbeef
-
     char tempfile[PATH_MAX];
-    snprintf (tempfile, sizeof (tempfile), "%s/config.tmp", dbconfdir);
-
     char str[PATH_MAX];
+    FILE *fp;
+    int err;
+
+    if (!changed) {
+        return 0;
+    }
+
+    snprintf (tempfile, sizeof (tempfile), "%s/config.tmp", dbconfdir);
     snprintf (str, sizeof (str), "%s/config", dbconfdir);
 
-    FILE *fp = fopen (tempfile, "w+t");
+    conf_lock ();
+    changed = 0;
+    fp = fopen (tempfile, "w+t");
     if (!fp) {
         fprintf (stderr, "failed to open config file for writing\n");
+        conf_unlock ();
         return -1;
     }
-    conf_lock ();
     for (DB_conf_item_t *it = conf_items; it; it = it->next) {
         if (fprintf (fp, "%s %s\n", it->key, it->value) < 0) {
             fprintf (stderr, "failed to write to file %s (%s)\n", tempfile, strerror (errno));
@@ -147,11 +154,11 @@ conf_save (void) {
         }
     }
     fclose (fp);
-    conf_unlock ();
-    int err = rename (tempfile, str);
+    err = rename (tempfile, str);
     if (err != 0) {
         fprintf (stderr, "config rename %s -> %s failed: %s\n", tempfile, str, strerror (errno));
     }
+    conf_unlock ();
     return 0;
 }
 
@@ -234,14 +241,18 @@ conf_find (const char *group, DB_conf_item_t *prev) {
 void
 conf_set_str (const char *key, const char *val) {
     conf_lock ();
-    changed = 1;
     DB_conf_item_t *prev = NULL;
     for (DB_conf_item_t *it = conf_items; it; it = it->next) {
         int cmp = strcasecmp (key, it->key);
         if (!cmp) {
+            if (!strcmp (it->value, val)) {
+                conf_unlock ();
+                return;
+            }
             free (it->value);
             it->value = strdup (val);
             conf_unlock ();
+            changed = 1;
             return;
         }
         else if (cmp < 0) {
@@ -257,6 +268,7 @@ conf_set_str (const char *key, const char *val) {
     memset (it, 0, sizeof (DB_conf_item_t));
     it->key = strdup (key);
     it->value = strdup (val);
+    changed = 1;
     if (prev) {
         DB_conf_item_t *next = prev->next;
         prev->next = it;
@@ -279,7 +291,7 @@ conf_set_int (const char *key, int val) {
 void
 conf_set_int64 (const char *key, int64_t val) {
     char s[20];
-    snprintf (s, sizeof (s), PRId64, val);
+    snprintf (s, sizeof (s), "%"PRId64, val);
     conf_set_str (key, s);
 }
 
diff --git a/configure b/configure
index e2d0b24..a4532e1 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 deadbeef 0.6.0.
+# Generated by GNU Autoconf 2.69 for deadbeef 0.6.2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='deadbeef'
 PACKAGE_TARNAME='deadbeef'
-PACKAGE_VERSION='0.6.0'
-PACKAGE_STRING='deadbeef 0.6.0'
+PACKAGE_VERSION='0.6.2'
+PACKAGE_STRING='deadbeef 0.6.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -650,8 +650,6 @@ HAVE_WMA_FALSE
 HAVE_WMA_TRUE
 HAVE_ALAC_FALSE
 HAVE_ALAC_TRUE
-HAVE_SHELLEXECUI_FALSE
-HAVE_SHELLEXECUI_TRUE
 HAVE_MONO2STEREO_FALSE
 HAVE_MONO2STEREO_TRUE
 HAVE_SHN_FALSE
@@ -688,6 +686,8 @@ HAVE_WILDMIDI_FALSE
 HAVE_WILDMIDI_TRUE
 HAVE_MUSEPACK_FALSE
 HAVE_MUSEPACK_TRUE
+HAVE_SHELLEXECUI_FALSE
+HAVE_SHELLEXECUI_TRUE
 HAVE_SHELLEXEC_FALSE
 HAVE_SHELLEXEC_TRUE
 HAVE_NOTIFY_FALSE
@@ -716,6 +716,8 @@ HAVE_FFAP_FALSE
 HAVE_FFAP_TRUE
 HAVE_ADPLUG_FALSE
 HAVE_ADPLUG_TRUE
+ARTWORK_USE_VFS_CURL_FALSE
+ARTWORK_USE_VFS_CURL_TRUE
 HAVE_ARTWORK_FALSE
 HAVE_ARTWORK_TRUE
 HAVE_PULSE_FALSE
@@ -738,16 +740,21 @@ HAVE_WAVPACK_FALSE
 HAVE_WAVPACK_TRUE
 HAVE_FLAC_FALSE
 HAVE_FLAC_TRUE
+HAVE_OGG_STREAM_FLUSH_FILL_FALSE
+HAVE_OGG_STREAM_FLUSH_FILL_TRUE
+HAVE_OGG_FALSE
+HAVE_OGG_TRUE
 HAVE_VORBIS_FALSE
 HAVE_VORBIS_TRUE
 APE_USE_YASM_FALSE
 APE_USE_YASM_TRUE
 LIBMMS_LIBS
 FAAD2_LIBS
+FAAD2_CFLAGS
 NOTIFY_CFLAGS
 NOTIFY_LIBS
-LIBSAMPLERATE_DEPS_CFLAGS
 LIBSAMPLERATE_DEPS_LIBS
+LIBSAMPLERATE_DEPS_CFLAGS
 IMLIB2_DEPS_LIBS
 IMLIB2_DEPS_CFLAGS
 PNG_DEPS_LIBS
@@ -756,14 +763,24 @@ JPEG_DEPS_LIBS
 JPEG_DEPS_CFLAGS
 OSS_CFLAGS
 HOTKEYS_LIBS
+HOTKEYS_CFLAGS
 CDDA_CFLAGS
 CDDA_LIBS
+VFS_CURL_CFLAGS
 VFS_CURL_LIBS
 SNDFILE_LIBS
+SNDFILE_CFLAGS
 WAVPACK_LIBS
+WAVPACK_CFLAGS
 FLAC_LIBS
+FLAC_CFLAGS
+OGG_CFLAGS
+OGG_LIBS
+VORBIS_CFLAGS
 VORBIS_LIBS
 MAD_LIBS
+MAD_CFLAGS
+CURL_CFLAGS
 CURL_LIBS
 ICONV_LIB
 PULSE_DEPS_LIBS
@@ -784,15 +801,17 @@ GTK_MAC_CFLAGS
 GTK3_DEPS_LIBS
 GTK3_DEPS_CFLAGS
 ZIP_LIBS
+ZIP_CFLAGS
 ZLIB_LIBS
+ZLIB_CFLAGS
 DL_LIBS
 HAVE_YASM
 INTL_LIBS
+NOCPPLIB
 INSANE_CXXFLAGS
 INSANE_CFLAGS
 YASM_FLAGS
 LIB
-NOCPPLIB
 GETTEXT_PACKAGE
 ALL_LINGUAS
 INTLTOOL_PERL
@@ -821,7 +840,6 @@ INTLTOOL_V_MERGE_OPTIONS
 INTLTOOL__v_MERGE_0
 INTLTOOL__v_MERGE_
 INTLTOOL_V_MERGE
-AM_DEFAULT_VERBOSITY
 INTLTOOL_EXTRACT
 INTLTOOL_MERGE
 INTLTOOL_UPDATE
@@ -940,6 +958,10 @@ CC
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -1004,6 +1026,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 enable_maintainer_mode
 enable_dependency_tracking
 enable_shared
@@ -1030,6 +1053,7 @@ enable_gtk2
 enable_vfs_curl
 enable_lfm
 enable_artwork
+enable_artwork_network
 enable_supereq
 enable_sid
 enable_mad
@@ -1087,6 +1111,8 @@ OBJCFLAGS
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
+ZIP_CFLAGS
+ZIP_LIBS
 GTK3_DEPS_CFLAGS
 GTK3_DEPS_LIBS
 GTK_MAC_CFLAGS
@@ -1645,7 +1671,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 deadbeef 0.6.0 to adapt to many kinds of systems.
+\`configure' configures deadbeef 0.6.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1715,7 +1741,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of deadbeef 0.6.0:";;
+     short | recursive ) echo "Configuration of deadbeef 0.6.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1723,10 +1749,15 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -1743,14 +1774,17 @@ Optional Features:
                           enabled)
   --disable-pulse         disable PulseAudio output plugin (default: enabled)
   --disable-coreaudio     disable CoreAudio output plugin (default: enabled)
-  --disable-gtk3          build GTK3 version of gtkui plugin (default:
+  --disable-gtk3          disable GTK3 version of gtkui plugin (default:
                           enabled)
-  --disable-gtk2          build GTK2 version of gtkui plugin (default:
+  --disable-gtk2          disable GTK2 version of gtkui plugin (default:
                           enabled)
   --disable-vfs-curl      disable HTTP streaming vfs plugin (default: enabled)
   --disable-lfm           disable last.fm/libre.fm scrobbler plugin (default:
                           enabled)
   --disable-artwork       disable album art loader plugin (default: enabled)
+  --disable-artwork-network
+                          disable album art network loading support (default:
+                          enabled)
   --disable-supereq       disable SuperEQ DSP plugin (default: enabled)
   --disable-sid           disable commodore64 SID music player plugin
                           (default: enabled)
@@ -1841,6 +1875,8 @@ Some influential environment variables:
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
+  ZIP_CFLAGS  C compiler flags for ZIP, overriding pkg-config
+  ZIP_LIBS    linker flags for ZIP, overriding pkg-config
   GTK3_DEPS_CFLAGS
               C compiler flags for GTK3_DEPS, overriding pkg-config
   GTK3_DEPS_LIBS
@@ -1944,7 +1980,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-deadbeef configure 0.6.0
+deadbeef configure 0.6.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2705,7 +2741,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 deadbeef $as_me 0.6.0, which was
+It was created by deadbeef $as_me 0.6.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3061,7 +3097,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_config_headers="$ac_config_headers config.h"
 
 
-am__api_version='1.11'
+am__api_version='1.14'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -3187,9 +3223,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -3200,32 +3233,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -3237,6 +3278,16 @@ Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -3259,12 +3310,12 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -3276,10 +3327,10 @@ if test x"${install_sh}" != xset; then
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -3418,12 +3469,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -3506,6 +3551,45 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -3528,7 +3612,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='deadbeef'
- VERSION='0.6.0'
+ VERSION='0.6.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3556,6 +3640,12 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
@@ -3563,86 +3653,125 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 AMTAR='$${TAR-tar}'
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
-$as_echo_n "checking how to create a ustar tar archive... " >&6; }
-# Loop over all known methods to create a tar archive until one works.
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar plaintar pax cpio none'
-_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      { echo "$as_me:$LINENO: $_am_tar --version" >&5
+
+# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
+$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
+      if test $am_uid -le $am_max_uid; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      else
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+         _am_tools=none
+      fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
+$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
+      if test $am_gid -le $am_max_gid; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        _am_tools=none
+      fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+$as_echo_n "checking how to create a ustar tar archive... " >&6; }
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        { echo "$as_me:$LINENO: $_am_tar --version" >&5
    ($_am_tar --version) >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && break
-    done
-    am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x ustar -w "$$tardir"'
-    am__tar_='pax -L -x ustar -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
-    am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
-    am__untar='cpio -i -H ustar -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
+      done
+      am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x ustar -w "$$tardir"'
+      am__tar_='pax -L -x ustar -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
+      am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
+      am__untar='cpio -i -H ustar -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_ustar}" && break
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_ustar}" && break
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
    (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
    ($am__untar <conftest.tar) >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
+      { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
+   (cat conftest.dir/file) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
 
-if ${am_cv_prog_tar_ustar+:} false; then :
+  if ${am_cv_prog_tar_ustar+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   am_cv_prog_tar_ustar=$_am_tool
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
 $as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
@@ -3650,6 +3779,48 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake at gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
@@ -3692,7 +3863,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -4525,6 +4696,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -4536,8 +4766,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -4572,16 +4802,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -4590,8 +4820,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -4599,7 +4829,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -12851,6 +13081,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -12862,8 +13151,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -12898,16 +13187,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -12916,8 +13205,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -12925,7 +13214,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -13247,8 +13536,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -13283,16 +13572,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -13301,8 +13590,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -13310,7 +13599,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -16840,8 +17129,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -16874,16 +17163,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -16892,8 +17181,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -16901,7 +17190,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -17294,6 +17583,13 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
  esac
 
 
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
@@ -23240,16 +23536,11 @@ _ACEOF
 
 
 case "$host" in
-  *-*-gnu)
-    NOCPPLIB="-nostdlib -lsupc++";;
-esac
-
-case "$host" in
   i686-apple-*)
 
 $as_echo "#define ARCH_X86_32 1" >>confdefs.h
 
-    LIB="../deadbeef-deps/lib-x86-32-apple"
+    LIB="static-deps/lib-x86-32-apple"
     YASM_FLAGS="-f macho32 -D ARCH_X86_32 -m x86 -DPREFIX"
     APE_USE_YASM=yes
     OS_OSX=yes
@@ -23258,7 +23549,7 @@ $as_echo "#define ARCH_X86_32 1" >>confdefs.h
 
 $as_echo "#define ARCH_X86_64 1" >>confdefs.h
 
-    LIB="../deadbeef-deps/lib-x86-64-apple"
+    LIB="static-deps/lib-x86-64-apple"
     YASM_FLAGS="-f macho64 -D ARCH_X86_64 -m amd64 -DPIC -DPREFIX"
     APE_USE_YASM=yes
     OS_OSX=yes
@@ -23267,7 +23558,7 @@ $as_echo "#define ARCH_X86_64 1" >>confdefs.h
 
 $as_echo "#define ARCH_X86_32 1" >>confdefs.h
 
-    LIB="../deadbeef-deps/lib-x86-32"
+    LIB="static-deps/lib-x86-32"
     YASM_FLAGS="-f elf -D ARCH_X86_32 -m x86"
     APE_USE_YASM=yes
     ;;
@@ -23275,22 +23566,21 @@ $as_echo "#define ARCH_X86_32 1" >>confdefs.h
 
 $as_echo "#define ARCH_X86_64 1" >>confdefs.h
 
-    LIB="../deadbeef-deps/lib-x86-64"
+    LIB="static-deps/lib-x86-64"
     YASM_FLAGS="-f elf -D ARCH_X86_64 -m amd64"
     APE_USE_YASM=yes
-    KILLCPPFLAGS="-nostdlib -lsupc++"
     ;;
   powerpc-*-* )
 
 $as_echo "#define ARCH_PPC_32 1" >>confdefs.h
 
-    LIB="../deadbeef-deps/lib-ppc-32"
+    LIB="static-deps/lib-ppc-32"
     ;;
   powerpc64-*-* )
 
 $as_echo "#define ARCH_PPC_64 1" >>confdefs.h
 
-    LIB="../deadbeef-deps/lib-ppc-64"
+    LIB="static-deps/lib-ppc-64"
     ;;
   *)
 
@@ -23301,7 +23591,6 @@ esac
 
 
 
-
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 
 
@@ -23378,6 +23667,13 @@ else
   enable_artwork=yes
 fi
 
+# Check whether --enable-artwork-network was given.
+if test "${enable_artwork_network+set}" = set; then :
+  enableval=$enable_artwork_network; enable_artwork_network=$enableval
+else
+  enable_artwork_network=yes
+fi
+
 # Check whether --enable-supereq was given.
 if test "${enable_supereq+set}" = set; then :
   enableval=$enable_supereq; enable_supereq=$enableval
@@ -23667,6 +23963,21 @@ _ACEOF
 
 fi
 
+case "$host" in
+  *-*-gnu )
+    if test "${enable_staticlink}" != "no"; then :
+
+        NOCPPLIB="-nostdlib ../../$LIB/lib/libsupc++.a"
+
+else
+
+        NOCPPLIB=""
+
+fi
+
+    ;;
+esac
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lintl" >&5
 $as_echo_n "checking for main in -lintl... " >&6; }
 if ${ac_cv_lib_intl_main+:} false; then :
@@ -23921,8 +24232,11 @@ CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE $PREFIXFLAGS -DDDB_WARN_DEPRECATED=
 if test "${enable_staticlink}" != "no"; then :
 
     HAVE_ZLIB=yes
+    ZLIB_CFLAGS="-I../../$LIB/include"
     ZLIB_LIBS="../../$LIB/lib/libz.a"
 
+
+
 else
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5
@@ -23961,59 +24275,101 @@ fi
 
     ZLIB_LIBS="-lz"
 
-fi
 
+fi
 
 if test "${enable_staticlink}" != "no"; then :
 
     HAVE_ZIP=yes
+    ZIP_CFLAGS="-I../../$LIB/include"
     ZIP_LIBS="../../$LIB/lib/libzip.a ../../$LIB/lib/libz.a"
 
-else
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lzip" >&5
-$as_echo_n "checking for main in -lzip... " >&6; }
-if ${ac_cv_lib_zip_main+:} false; then :
-  $as_echo_n "(cached) " >&6
+
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lzip  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
 
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_zip_main=yes
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZIP" >&5
+$as_echo_n "checking for ZIP... " >&6; }
+
+if test -n "$ZIP_CFLAGS"; then
+    pkg_cv_ZIP_CFLAGS="$ZIP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libzip") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_ZIP_CFLAGS=`$PKG_CONFIG --cflags "libzip" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  ac_cv_lib_zip_main=no
+  pkg_failed=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ else
+    pkg_failed=untried
+fi
+if test -n "$ZIP_LIBS"; then
+    pkg_cv_ZIP_LIBS="$ZIP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libzip") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_ZIP_LIBS=`$PKG_CONFIG --libs "libzip" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_main" >&5
-$as_echo "$ac_cv_lib_zip_main" >&6; }
-if test "x$ac_cv_lib_zip_main" = xyes; then :
-  HAVE_ZIP=yes
+ else
+    pkg_failed=untried
 fi
 
-    ZIP_LIBS="-lzip"
 
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
 fi
+        if test $_pkg_short_errors_supported = yes; then
+	        ZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libzip" 2>&1`
+        else
+	        ZIP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libzip" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$ZIP_PKG_ERRORS" >&5
 
+	HAVE_ZIP=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_ZIP=no
+else
+	ZIP_CFLAGS=$pkg_cv_ZIP_CFLAGS
+	ZIP_LIBS=$pkg_cv_ZIP_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_ZIP=yes
+fi
+
+fi
 
 if test "${enable_gtk3}" = "yes"; then :
 
     if test "${enable_staticlink}" != "no"; then :
 
+        GTK3_DEPS_CFLAGS="-I../../${LIB}/gtk-3.0.0/include/gtk-3.0 -I../../${LIB}/gtk-3.0.0/include/pango-1.0 -I../../${LIB}/gtk-3.0.0/include/gio-unix-2.0/ -I../../${LIB}/gtk-3.0.0/include/atk-1.0 -I../../${LIB}/gtk-3.0.0/include/cairo -I../../${LIB}/gtk-3.0.0/include/gdk-pixbuf-2.0 -I../../${LIB}/gtk-3.0.0/include/freetype2 -I../../${LIB}/gtk-3.0.0/include/glib-2.0 -I../../${LIB}/gtk-3.0.0/lib/glib-2.0/include"
+        GTK3_DEPS_LIBS="-L${GTK_ROOT_300}/lib -lgtk-3 -lpango-1.0 -lcairo -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
+
+
         HAVE_GTK3=yes
 
 else
@@ -24206,6 +24562,10 @@ if test "${enable_gtk2}" = "yes"; then :
 
     if test "${enable_staticlink}" != "no"; then :
 
+        GTK2_DEPS_CFLAGS="-I${GTK_ROOT_216}/include/gtk-2.0 -I${GTK_ROOT_216}/lib/gtk-2.0/include -I${GTK_ROOT_216}/include/atk-1.0 -I${GTK_ROOT_216}/include/cairo -I${GTK_ROOT_216}/include/pango-1.0 -I${GTK_ROOT_216}/include -I${GTK_ROOT_216}/include/glib-2.0 -I${GTK_ROOT_216}/lib/glib-2.0/include"
+        GTK2_DEPS_LIBS="-L${GTK_ROOT_216}/lib -lgtk-x11-2.0 -lpango-1.0 -lcairo -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
+
+
         HAVE_GTK2=yes
 
 else
@@ -24292,6 +24652,16 @@ fi
 
 if test "${enable_alsa}" != "no"; then :
 
+    if test "${enable_staticlink}" != "no"; then :
+
+        HAVE_ALSA=yes
+        ALSA_DEPS_CFLAGS="-I../../$LIB/include"
+        ALSA_DEPS_LIBS="-lasound"
+
+
+
+else
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA_DEPS" >&5
@@ -24366,6 +24736,8 @@ fi
 
 fi
 
+fi
+
 ac_fn_c_check_header_mongrel "$LINENO" "CoreAudio/AudioHardware.h" "ac_cv_header_CoreAudio_AudioHardware_h" "$ac_includes_default"
 if test "x$ac_cv_header_CoreAudio_AudioHardware_h" = xyes; then :
   found_coreaudio_h=yes
@@ -24381,7 +24753,7 @@ if test "${enable_coreaudio}" != "no" -a "${found_coreaudio_h}" != "no"; then :
 $as_echo "#define HAVE_COREAUDIO 1" >>confdefs.h
 
   HAVE_COREAUDIO=yes
-  COREAUDIO_LIBS="-Wl,-framework,CoreAudio"
+  COREAUDIO_LIBS="-Wl,-framework,CoreAudio -Wl,-framework,AudioUnit"
 
 fi
 
@@ -24560,6 +24932,16 @@ fi
 
 if test "${enable_pulse}" != "no"; then :
 
+    if test "${enable_staticlink}" != "no"; then :
+
+        HAVE_PULSE=yes
+        PULSE_DEPS_LIBS="-lpulse-simple"
+        PULSE_DEPS_CFLAGS="-I../../$LIB/include/"
+
+
+
+else
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSE_DEPS" >&5
@@ -24634,6 +25016,8 @@ fi
 
 fi
 
+fi
+
 ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
 if test "x$ac_cv_header_iconv_h" = xyes; then :
 
@@ -24738,6 +25122,8 @@ if test "${enable_staticlink}" != "no"; then :
 
     HAVE_CURL=yes
     CURL_LIBS="../../$LIB/lib/libcurl.a -lrt"
+    CURL_CFLAGS="-I../../$LIB/include"
+
 
 
 else
@@ -24787,9 +25173,11 @@ if test "${enable_mpgmad}" != "no"; then :
     if test "${enable_staticlink}" != "no"; then :
 
         HAVE_MPGMAD=yes
+        MAD_CFLAGS="-I../../$LIB/include"
         MAD_LIBS="../../$LIB/lib/libmad.a"
 
 
+
 else
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmad" >&5
@@ -24843,7 +25231,9 @@ if test "${enable_vorbis}" != "no"; then :
     if test "${enable_staticlink}" != "no"; then :
 
         HAVE_VORBISPLUGIN=yes
-        VORBIS_LIBS="../../$LIB/lib/libogg.a ../../$LIB/lib/libvorbis.a ../../$LIB/lib/libvorbisenc.a ../../$LIB/lib/libvorbisfile.a"
+        VORBIS_LIBS="-lvorbisfile -lvorbis -lm -logg"
+        VORBIS_CFLAGS="-I../../$LIB/include"
+
 
 
 else
@@ -24928,12 +25318,109 @@ fi
 
 fi
 
+if test "${enable_staticlink}" != "no"; then :
+
+    HAVE_OGG=yes
+    OGG_LIBS="-logg"
+    OGG_CFLAGS="-I../../$LIB/include"
+
+
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -logg" >&5
+$as_echo_n "checking for main in -logg... " >&6; }
+if ${ac_cv_lib_ogg_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-logg  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ogg_main=yes
+else
+  ac_cv_lib_ogg_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ogg_main" >&5
+$as_echo "$ac_cv_lib_ogg_main" >&6; }
+if test "x$ac_cv_lib_ogg_main" = xyes; then :
+  HAVE_OGG=yes
+fi
+
+    if test "$HAVE_OGG" = "yes"; then :
+
+        HAVE_VORBISPLUGIN=yes
+        OGG_LIBS="-logg"
+
+
+fi
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ogg_stream_flush_fill in -logg" >&5
+$as_echo_n "checking for ogg_stream_flush_fill in -logg... " >&6; }
+if ${ac_cv_lib_ogg_ogg_stream_flush_fill+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-logg  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ogg_stream_flush_fill ();
+int
+main ()
+{
+return ogg_stream_flush_fill ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ogg_ogg_stream_flush_fill=yes
+else
+  ac_cv_lib_ogg_ogg_stream_flush_fill=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ogg_ogg_stream_flush_fill" >&5
+$as_echo "$ac_cv_lib_ogg_ogg_stream_flush_fill" >&6; }
+if test "x$ac_cv_lib_ogg_ogg_stream_flush_fill" = xyes; then :
+  HAVE_OGG_STREAM_FLUSH_FILL=yes
+fi
+
+
 if test "${enable_flac}" != "no"; then :
 
     if test "${enable_staticlink}" != "no"; then :
 
         HAVE_FLACPLUGIN=yes
-        FLAC_LIBS="../../$LIB/lib/libFLAC.a ../../$LIB/lib/libogg.a"
+        FLAC_CFLAGS="-I../../$LIB/include"
+        FLAC_LIBS="-lFLAC"
+
 
 
 else
@@ -24989,9 +25476,11 @@ if test "${enable_wavpack}" != "no"; then :
     if test "${enable_staticlink}" != "no"; then :
 
         HAVE_WAVPACKPLUGIN=yes
+        WAVPACK_CFLAGS="-I../../$LIB/include"
         WAVPACK_LIBS="../../$LIB/lib/libwavpack.a"
 
 
+
 else
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lwavpack" >&5
@@ -25045,9 +25534,11 @@ if test "${enable_sndfile}" != "no"; then :
     if test "${enable_staticlink}" != "no"; then :
 
         HAVE_SNDFILEPLUGIN=yes
+        SNDFILE_CFLAGS="-I../../$LIB/include"
         SNDFILE_LIBS="../../$LIB/lib/libsndfile.a"
 
 
+
 else
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lsndfile" >&5
@@ -25103,6 +25594,8 @@ if test "${enable_vfs_curl}" != "no"; then :
         HAVE_VFS_CURL=yes
         VFS_CURL_LIBS="$CURL_LIBS"
 
+        VFS_CURL_CFLAGS="$CURL_CFLAGS"
+
 
 fi
 
@@ -25232,17 +25725,33 @@ fi
 
 if test "${enable_hotkeys}" != "no"; then :
 
-    ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default"
+    if test "${enable_staticlink}" != "no"; then :
+
+        HOTKEYS_CFLAGS="-I../../$LIB/include"
+        HOTKEYS_LIBS="-lX11"
+
+
+        HAVE_HOTKEYS=yes
+
+else
+
+        ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default"
 if test "x$ac_cv_header_X11_Xlib_h" = xyes; then :
   HAVE_XLIB_H=yes
 fi
 
 
-    if test "${HAVE_XLIB_H}" = "yes"; then :
+        if test "${HAVE_XLIB_H}" = "yes"; then :
 
-        HOTKEYS_LIBS="-lX11"
+            if test "${HAVE_XLIB_H}" = "yes"; then :
 
-        HAVE_HOTKEYS=yes
+                HOTKEYS_LIBS="-lX11"
+
+                HAVE_HOTKEYS=yes
+
+fi
+
+fi
 
 fi
 
@@ -25353,6 +25862,15 @@ if test "${enable_shellexec}" != "no"; then :
 
 fi
 
+if test "${enable_shellexecui}" != "no" -a "${enable_shellexec}" != "no"; then :
+
+    if test "${HAVE_GTK2}" = "yes" -o "${HAVE_GTK3}" = "yes"; then :
+
+        HAVE_SHELLEXECUI=yes
+
+fi
+
+fi
 
 if test "${enable_artwork}" != "no"; then :
 
@@ -25523,9 +26041,15 @@ fi
 
 fi
 
-    if test "${HAVE_VFS_CURL}" = "yes"; then :
+    if test "${enable_artwork_network}" = "yes"; then :
 
-        if test "${HAVE_JPEG}" = "yes" -o "${HAVE_IMLIB2}" == "yes"; then :
+        ARTWORK_USE_VFS_CURL=yes
+
+fi
+
+    if test "${HAVE_VFS_CURL}" = "yes" -o "${enable_artwork_network}" = "no" ; then :
+
+        if test "${HAVE_JPEG}" = "yes" -o "${HAVE_IMLIB2}" = "yes"; then :
 
             HAVE_ARTWORK=yes
 
@@ -25567,8 +26091,10 @@ if test "${enable_src}" != "no"; then :
 
     if test "${enable_staticlink}" != "no"; then :
 
+        LIBSAMPLERATE_DEPS_CFLAGS="-I../../$LIB/include"
         LIBSAMPLERATE_DEPS_LIBS="../../$LIB/lib/libsamplerate.a -lpthread ${DL_LIBS}"
 
+
         HAVE_DSP_SRC=yes
 
 else
@@ -25710,8 +26236,10 @@ if test "${enable_aac}" != "no"; then :
 
     if test "${enable_staticlink}" != "no"; then :
 
+        FAAD2_CFLAGS="-I../../$LIB/include"
         FAAD2_LIBS="../../$LIB/lib/libfaad.a"
 
+
         HAVE_AAC=yes
 
 else
@@ -25797,16 +26325,6 @@ fi
 fi
 
 
-if test "${enable_shellexecui}" != "no"; then :
-
-    if test "${HAVE_GTK2}" = "yes" -o "${HAVE_GTK3}" = "yes"; then :
-
-        HAVE_SHELLEXECUI=yes
-
-fi
-
-fi
-
 if test "${enable_dumb}" != "no"; then :
 
     HAVE_DUMB=yes
@@ -25849,7 +26367,7 @@ if test "${enable_pltbrowser}" != "no"; then :
 
 fi
 
-PLUGINS_DIRS="plugins/libmp4ff plugins/libparser plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/shellexecui plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio"
+PLUGINS_DIRS="plugins/liboggedit plugins/libmp4ff plugins/libparser plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio"
 
  if test "x$APE_USE_YASM" = "xyes"; then
   APE_USE_YASM_TRUE=
@@ -25867,6 +26385,22 @@ else
   HAVE_VORBIS_FALSE=
 fi
 
+ if test "x$HAVE_OGG" = "xyes"; then
+  HAVE_OGG_TRUE=
+  HAVE_OGG_FALSE='#'
+else
+  HAVE_OGG_TRUE='#'
+  HAVE_OGG_FALSE=
+fi
+
+ if test "x$HAVE_OGG_STREAM_FLUSH_FILL" = "xyes"; then
+  HAVE_OGG_STREAM_FLUSH_FILL_TRUE=
+  HAVE_OGG_STREAM_FLUSH_FILL_FALSE='#'
+else
+  HAVE_OGG_STREAM_FLUSH_FILL_TRUE='#'
+  HAVE_OGG_STREAM_FLUSH_FILL_FALSE=
+fi
+
  if test "x$HAVE_FLACPLUGIN" = "xyes"; then
   HAVE_FLAC_TRUE=
   HAVE_FLAC_FALSE='#'
@@ -25955,6 +26489,14 @@ else
   HAVE_ARTWORK_FALSE=
 fi
 
+ if test "x$ARTWORK_USE_VFS_CURL" = "xyes"; then
+  ARTWORK_USE_VFS_CURL_TRUE=
+  ARTWORK_USE_VFS_CURL_FALSE='#'
+else
+  ARTWORK_USE_VFS_CURL_TRUE='#'
+  ARTWORK_USE_VFS_CURL_FALSE=
+fi
+
  if test "x$HAVE_ADPLUG" = "xyes"; then
   HAVE_ADPLUG_TRUE=
   HAVE_ADPLUG_FALSE='#'
@@ -26067,6 +26609,14 @@ else
   HAVE_SHELLEXEC_FALSE=
 fi
 
+ if test "x$HAVE_SHELLEXECUI" = "xyes"; then
+  HAVE_SHELLEXECUI_TRUE=
+  HAVE_SHELLEXECUI_FALSE='#'
+else
+  HAVE_SHELLEXECUI_TRUE='#'
+  HAVE_SHELLEXECUI_FALSE=
+fi
+
  if test "x$HAVE_MUSEPACK" = "xyes"; then
   HAVE_MUSEPACK_TRUE=
   HAVE_MUSEPACK_FALSE='#'
@@ -26211,14 +26761,6 @@ else
   HAVE_MONO2STEREO_FALSE=
 fi
 
- if test "x$HAVE_SHELLEXECUI" = "xyes"; then
-  HAVE_SHELLEXECUI_TRUE=
-  HAVE_SHELLEXECUI_FALSE='#'
-else
-  HAVE_SHELLEXECUI_TRUE='#'
-  HAVE_SHELLEXECUI_FALSE=
-fi
-
  if test "x$HAVE_ALAC" = "xyes"; then
   HAVE_ALAC_TRUE=
   HAVE_ALAC_FALSE='#'
@@ -26463,9 +27005,9 @@ echo
 
 
         if test "x$HAVE_HOTKEYS" = "xyes" ; then
-            echo "    hotkeys: yes - Global hotkeys support"
+            echo "    hotkeys: yes - Local and global hotkeys support"
         else
-            echo "    hotkeys: no - Global hotkeys support"
+            echo "    hotkeys: no - Local and global hotkeys support"
         fi
 
 
@@ -26510,6 +27052,14 @@ echo
 
 
 
+        if test "x$HAVE_SHELLEXECUI" = "xyes" ; then
+            echo "    shellexecui: yes - GTK user interface for setting up shellexec plugin"
+        else
+            echo "    shellexecui: no - GTK user interface for setting up shellexec plugin"
+        fi
+
+
+
         if test "x$HAVE_MUSEPACK" = "xyes" ; then
             echo "    musepack: yes - musepack player plugin"
         else
@@ -26622,14 +27172,6 @@ echo
 
 
 
-        if test "x$HAVE_SHELLEXECUI" = "xyes" ; then
-            echo "    shellexecui: yes - GTK user interface for configuring shellexec plugin"
-        else
-            echo "    shellexecui: no - GTK user interface for configuring shellexec plugin"
-        fi
-
-
-
         if test "x$HAVE_ALAC" = "xyes" ; then
             echo "    alac: yes - ALAC plugin"
         else
@@ -26656,7 +27198,7 @@ echo
 
 echo
 
-ac_config_files="$ac_config_files Makefile pixmaps/Makefile icons/Makefile plugins/libmp4ff/Makefile plugins/libparser/Makefile plugins/gme/Makefile plugins/alsa/Makefile plugins/hotkeys/Makefile plugins/lastfm/Makefile plugins/ffap/Makefile plugins/mpgmad/Makefile plugins/vorbis/Makefile plugins/flac/Makefile plugins/wavpack/Makefile plugins/sndfile/Makefile plugins/vfs_curl/Makefile plugins/cdda/Makefile plugins/gtkui/Makefile plugins/nullout/Makefile plugins/vtx/Makefile plugins/adplug/Makefile plugins/ffmpeg/Makefile plugins/sid/Makefile plugins/oss/Makefile plugins/pulse/Makefile plugins/artwork/Makefile plugins/supereq/Makefile plugins/notify/Makefile plugins/shellexec/Makefile plugins/musepack/Makefile plugins/wildmidi/Makefile plugins/tta/Makefile plugins/dca/Makefile plugins/aac/Makefile plugins/mms/Makefile plugins/dsp_libsrc/Makefile plugins/m3u/Makefile plugins/vfs_zip/Makefile plugins/converter/Makefile plugins/dumb/Makefile plugins/ao/Makefile plugins/shn/Makefile plugins/mono2stereo/Makefile plugins/shellexecui/Makefile plugins/alac/Makefile plugins/wma/Makefile plugins/pltbrowser/Makefile plugins/coreaudio/Makefile intl/Makefile po/Makefile.in deadbeef.desktop"
+ac_config_files="$ac_config_files Makefile pixmaps/Makefile icons/Makefile plugins/liboggedit/Makefile plugins/libmp4ff/Makefile plugins/libparser/Makefile plugins/gme/Makefile plugins/alsa/Makefile plugins/hotkeys/Makefile plugins/lastfm/Makefile plugins/ffap/Makefile plugins/mpgmad/Makefile plugins/vorbis/Makefile plugins/flac/Makefile plugins/wavpack/Makefile plugins/sndfile/Makefile plugins/vfs_curl/Makefile plugins/cdda/Makefile plugins/gtkui/Makefile plugins/nullout/Makefile plugins/vtx/Makefile plugins/adplug/Makefile plugins/ffmpeg/Makefile plugins/sid/Makefile plugins/oss/Makefile plugins/pulse/Makefile plugins/artwork/Makefile plugins/supereq/Makefile plugins/notify/Makefile plugins/shellexec/Makefile plugins/musepack/Makefile plugins/wildmidi/Makefile plugins/tta/Makefile plugins/dca/Makefile plugins/aac/Makefile plugins/mms/Makefile plugins/dsp_libsrc/Makefile plugins/m3u/Makefile plugins/vfs_zip/Makefile plugins/converter/Makefile plugins/dumb/Makefile plugins/ao/Makefile plugins/shn/Makefile plugins/mono2stereo/Makefile plugins/shellexecui/Makefile plugins/alac/Makefile plugins/wma/Makefile plugins/pltbrowser/Makefile plugins/coreaudio/Makefile intl/Makefile po/Makefile.in deadbeef.desktop"
 
 
 cat >confcache <<\_ACEOF
@@ -26768,6 +27310,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -26817,6 +27367,14 @@ if test -z "${HAVE_VORBIS_TRUE}" && test -z "${HAVE_VORBIS_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_VORBIS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_OGG_TRUE}" && test -z "${HAVE_OGG_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_OGG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_OGG_STREAM_FLUSH_FILL_TRUE}" && test -z "${HAVE_OGG_STREAM_FLUSH_FILL_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_OGG_STREAM_FLUSH_FILL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_FLAC_TRUE}" && test -z "${HAVE_FLAC_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_FLAC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -26861,6 +27419,10 @@ if test -z "${HAVE_ARTWORK_TRUE}" && test -z "${HAVE_ARTWORK_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_ARTWORK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ARTWORK_USE_VFS_CURL_TRUE}" && test -z "${ARTWORK_USE_VFS_CURL_FALSE}"; then
+  as_fn_error $? "conditional \"ARTWORK_USE_VFS_CURL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_ADPLUG_TRUE}" && test -z "${HAVE_ADPLUG_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_ADPLUG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -26917,6 +27479,10 @@ if test -z "${HAVE_SHELLEXEC_TRUE}" && test -z "${HAVE_SHELLEXEC_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_SHELLEXEC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_SHELLEXECUI_TRUE}" && test -z "${HAVE_SHELLEXECUI_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_SHELLEXECUI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_MUSEPACK_TRUE}" && test -z "${HAVE_MUSEPACK_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_MUSEPACK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -26989,10 +27555,6 @@ if test -z "${HAVE_MONO2STEREO_TRUE}" && test -z "${HAVE_MONO2STEREO_FALSE}"; th
   as_fn_error $? "conditional \"HAVE_MONO2STEREO\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_SHELLEXECUI_TRUE}" && test -z "${HAVE_SHELLEXECUI_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_SHELLEXECUI\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HAVE_ALAC_TRUE}" && test -z "${HAVE_ALAC_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_ALAC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27418,7 +27980,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 deadbeef $as_me 0.6.0, which was
+This file was extended by deadbeef $as_me 0.6.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27484,7 +28046,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="\\
-deadbeef config.status 0.6.0
+deadbeef config.status 0.6.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -28002,6 +28564,7 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
     "icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;
+    "plugins/liboggedit/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/liboggedit/Makefile" ;;
     "plugins/libmp4ff/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/libmp4ff/Makefile" ;;
     "plugins/libparser/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/libparser/Makefile" ;;
     "plugins/gme/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/gme/Makefile" ;;
@@ -28647,7 +29210,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -28660,7 +29223,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -28694,21 +29257,19 @@ $as_echo X"$mf" |
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
diff --git a/configure.ac b/configure.ac
index 71d4854..eea4017 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([deadbeef], [0.6.0])
+AC_INIT([deadbeef], [0.6.2])
 
 AC_CONFIG_HEADER(config.h)
 
@@ -28,51 +28,44 @@ test "$prefix" = NONE && prefix=/usr/local
 AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/${DATADIRNAME}/locale", [Name of gettext locale directory])
 
 case "$host" in
-  *-*-gnu)
-    NOCPPLIB="-nostdlib -lsupc++";;
-esac
-
-case "$host" in
   i686-apple-*)
     AC_DEFINE(ARCH_X86_32, 1, [architecture is x86 on OSX])
-    LIB="../deadbeef-deps/lib-x86-32-apple"
+    LIB="static-deps/lib-x86-32-apple"
     YASM_FLAGS="-f macho32 -D ARCH_X86_32 -m x86 -DPREFIX"
     APE_USE_YASM=yes
     OS_OSX=yes
     ;;
   x86_64-apple-*)
     AC_DEFINE(ARCH_X86_64, 1, [architecture is x86_64 on OSX])
-    LIB="../deadbeef-deps/lib-x86-64-apple"
+    LIB="static-deps/lib-x86-64-apple"
     YASM_FLAGS="-f macho64 -D ARCH_X86_64 -m amd64 -DPIC -DPREFIX"
     APE_USE_YASM=yes
     OS_OSX=yes
     ;;
   i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
     AC_DEFINE(ARCH_X86_32, 1, [architecture is x86])
-    LIB="../deadbeef-deps/lib-x86-32"
+    LIB="static-deps/lib-x86-32"
     YASM_FLAGS="-f elf -D ARCH_X86_32 -m x86"
     APE_USE_YASM=yes
     ;;
   x86_64-*-* | amd64-*-*)
     AC_DEFINE(ARCH_X86_64, 1, [architecture is x86_64])
-    LIB="../deadbeef-deps/lib-x86-64"
+    LIB="static-deps/lib-x86-64"
     YASM_FLAGS="-f elf -D ARCH_X86_64 -m amd64"
     APE_USE_YASM=yes
-    KILLCPPFLAGS="-nostdlib -lsupc++"
     ;;
   powerpc-*-* )
     AC_DEFINE(ARCH_PPC_32, 1, [architecture is ppc32])
-    LIB="../deadbeef-deps/lib-ppc-32"
+    LIB="static-deps/lib-ppc-32"
     ;;
   powerpc64-*-* )
     AC_DEFINE(ARCH_PPC_64, 1, [architecture is ppc64])
-    LIB="../deadbeef-deps/lib-ppc-64"
+    LIB="static-deps/lib-ppc-64"
     ;;
   *)
     AC_DEFINE(ARCH_UNKNOWN, 1, [architecture is unknown])
     ;;
 esac
-AC_SUBST(NOCPPLIB)
 AC_SUBST(LIB)
 AC_SUBST(YASM_FLAGS)
 
@@ -89,11 +82,12 @@ AC_ARG_ENABLE(alsa,     [AS_HELP_STRING([--disable-alsa    ], [disable ALSA outp
 AC_ARG_ENABLE(oss,      [AS_HELP_STRING([--disable-oss     ], [disable Open Sound System output plugin (default: enabled)])], [enable_oss=$enableval], [enable_oss=yes])
 AC_ARG_ENABLE(pulse,    [AS_HELP_STRING([--disable-pulse   ], [disable PulseAudio output plugin (default: enabled)])], [enable_pulse=$enableval], [enable_pulse=yes])
 AC_ARG_ENABLE(coreaudio,[AS_HELP_STRING([--disable-coreaudio], [disable CoreAudio output plugin (default: enabled)])], [enable_coreaudio=$enableval], [enable_coreaudio=yes])
-AC_ARG_ENABLE(gtk3,     [AS_HELP_STRING([--disable-gtk3     ], [build GTK3 version of gtkui plugin (default: enabled)])], [enable_gtk3=$enableval], [enable_gtk3=yes])
-AC_ARG_ENABLE(gtk2,     [AS_HELP_STRING([--disable-gtk2     ], [build GTK2 version of gtkui plugin (default: enabled)])], [enable_gtk2=$enableval], [enable_gtk2=yes])
+AC_ARG_ENABLE(gtk3,     [AS_HELP_STRING([--disable-gtk3     ], [disable GTK3 version of gtkui plugin (default: enabled)])], [enable_gtk3=$enableval], [enable_gtk3=yes])
+AC_ARG_ENABLE(gtk2,     [AS_HELP_STRING([--disable-gtk2     ], [disable GTK2 version of gtkui plugin (default: enabled)])], [enable_gtk2=$enableval], [enable_gtk2=yes])
 AC_ARG_ENABLE(vfs_curl, [AS_HELP_STRING([--disable-vfs-curl], [disable HTTP streaming vfs plugin (default: enabled)])], [enable_vfs_curl=$enableval], [enable_vfs_curl=yes])
 AC_ARG_ENABLE(lfm,      [AS_HELP_STRING([--disable-lfm     ], [disable last.fm/libre.fm scrobbler plugin (default: enabled)])], [enable_lfm=$enableval], [enable_lfm=yes])
 AC_ARG_ENABLE(artwork,  [AS_HELP_STRING([--disable-artwork ], [disable album art loader plugin (default: enabled)])], [enable_artwork=$enableval], [enable_artwork=yes])
+AC_ARG_ENABLE(artwork-network,  [AS_HELP_STRING([--disable-artwork-network ], [disable album art network loading support (default: enabled)])], [enable_artwork_network=$enableval], [enable_artwork_network=yes])
 AC_ARG_ENABLE(supereq,  [AS_HELP_STRING([--disable-supereq ], [disable SuperEQ DSP plugin (default: enabled)])], [enable_supereq=$enableval], [enable_supereq=yes])
 AC_ARG_ENABLE(sid,      [AS_HELP_STRING([--disable-sid     ], [disable commodore64 SID music player plugin (default: enabled)])], [enable_sid=$enableval], [enable_sid=yes])
 AC_ARG_ENABLE(mad,      [AS_HELP_STRING([--disable-mad     ], [disable mpeg (mad) plugin (default: enabled)])], [enable_mpgmad=$enableval], [enable_mpgmad=yes])
@@ -144,6 +138,17 @@ AS_IF([test "${enable_abstract_socket}" != "no"], [
     USE_ABSTRACT_SOCKET_NAME=yes
 ])
 
+case "$host" in
+  *-*-gnu )
+    AS_IF([test "${enable_staticlink}" != "no"], [
+        NOCPPLIB="-nostdlib ../../$LIB/lib/libsupc++.a"
+    ], [
+        NOCPPLIB=""
+    ])
+    AC_SUBST(NOCPPLIB)
+    ;;
+esac
+
 AC_CHECK_LIB([intl], [main], [INTL_LIBS="-lintl";AC_SUBST(INTL_LIBS)])
 
 dnl check for yasm
@@ -183,24 +188,32 @@ CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE $PREFIXFLAGS -DDDB_WARN_DEPRECATED=
 
 AS_IF([test "${enable_staticlink}" != "no"], [
     HAVE_ZLIB=yes
+    ZLIB_CFLAGS="-I../../$LIB/include"
     ZLIB_LIBS="../../$LIB/lib/libz.a"
+    AC_SUBST(ZLIB_CFLAGS)
+    AC_SUBST(ZLIB_LIBS)
 ], [
     AC_CHECK_LIB([z], [main], [HAVE_ZLIB=yes])
     ZLIB_LIBS="-lz"
+    AC_SUBST(ZLIB_LIBS)
 ])
-AC_SUBST(ZLIB_LIBS)
 
 AS_IF([test "${enable_staticlink}" != "no"], [
     HAVE_ZIP=yes
+    ZIP_CFLAGS="-I../../$LIB/include"
     ZIP_LIBS="../../$LIB/lib/libzip.a ../../$LIB/lib/libz.a"
+    AC_SUBST(ZIP_CFLAGS)
+    AC_SUBST(ZIP_LIBS)
 ], [
-    AC_CHECK_LIB([zip], [main], [HAVE_ZIP=yes])
-    ZIP_LIBS="-lzip"
+    PKG_CHECK_MODULES(ZIP, libzip, HAVE_ZIP=yes, HAVE_ZIP=no)
 ])
-AC_SUBST(ZIP_LIBS)
 
 AS_IF([test "${enable_gtk3}" = "yes"], [
     AS_IF([test "${enable_staticlink}" != "no"], [
+        GTK3_DEPS_CFLAGS="-I../../${LIB}/gtk-3.0.0/include/gtk-3.0 -I../../${LIB}/gtk-3.0.0/include/pango-1.0 -I../../${LIB}/gtk-3.0.0/include/gio-unix-2.0/ -I../../${LIB}/gtk-3.0.0/include/atk-1.0 -I../../${LIB}/gtk-3.0.0/include/cairo -I../../${LIB}/gtk-3.0.0/include/gdk-pixbuf-2.0 -I../../${LIB}/gtk-3.0.0/include/freetype2 -I../../${LIB}/gtk-3.0.0/include/glib-2.0 -I../../${LIB}/gtk-3.0.0/lib/glib-2.0/include"
+        GTK3_DEPS_LIBS="-L${GTK_ROOT_300}/lib -lgtk-3 -lpango-1.0 -lcairo -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
+        AC_SUBST(GTK3_DEPS_CFLAGS)
+        AC_SUBST(GTK3_DEPS_LIBS)
         HAVE_GTK3=yes
     ], [
        PKG_CHECK_MODULES(GTK3_DEPS, gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0, HAVE_GTK3=yes, HAVE_GTK3=no)
@@ -220,6 +233,10 @@ AM_CONDITIONAL(OS_OSX, test "x$OS_OSX" = "xyes")
 
 AS_IF([test "${enable_gtk2}" = "yes"], [
     AS_IF([test "${enable_staticlink}" != "no"], [
+        GTK2_DEPS_CFLAGS="-I${GTK_ROOT_216}/include/gtk-2.0 -I${GTK_ROOT_216}/lib/gtk-2.0/include -I${GTK_ROOT_216}/include/atk-1.0 -I${GTK_ROOT_216}/include/cairo -I${GTK_ROOT_216}/include/pango-1.0 -I${GTK_ROOT_216}/include -I${GTK_ROOT_216}/include/glib-2.0 -I${GTK_ROOT_216}/lib/glib-2.0/include"
+        GTK2_DEPS_LIBS="-L${GTK_ROOT_216}/lib -lgtk-x11-2.0 -lpango-1.0 -lcairo -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
+        AC_SUBST(GTK2_DEPS_CFLAGS)
+        AC_SUBST(GTK2_DEPS_LIBS)
         HAVE_GTK2=yes
     ], [
         PKG_CHECK_MODULES(GTK2_DEPS, gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0, HAVE_GTK2=yes, HAVE_GTK2=no)
@@ -231,7 +248,16 @@ dnl    AC_CHECK_LIB([ICE], [main], [HAVE_ICE=yes;ICE_LIBS="-lICE";AC_SUBST(ICE_L
 ])
 
 AS_IF([test "${enable_alsa}" != "no"], [
-    PKG_CHECK_MODULES(ALSA_DEPS, alsa, HAVE_ALSA=yes, HAVE_ALSA=no)
+    AS_IF([test "${enable_staticlink}" != "no"], [
+        HAVE_ALSA=yes
+        ALSA_DEPS_CFLAGS="-I../../$LIB/include"
+        ALSA_DEPS_LIBS="-lasound"
+        AC_SUBST(ALSA_DEPS_CFLAGS)
+        AC_SUBST(ALSA_DEPS_LIBS)
+    ],
+    [
+        PKG_CHECK_MODULES(ALSA_DEPS, alsa, HAVE_ALSA=yes, HAVE_ALSA=no)
+    ])
 ])
 
 AC_CHECK_HEADER([CoreAudio/AudioHardware.h], [found_coreaudio_h=yes], [found_coreaudio_h=no])
@@ -239,7 +265,7 @@ AC_CHECK_HEADER([CoreAudio/AudioHardware.h], [found_coreaudio_h=yes], [found_cor
 AS_IF([test "${enable_coreaudio}" != "no" -a "${found_coreaudio_h}" != "no"], [
   AC_DEFINE(HAVE_COREAUDIO, 1, [Build coreaudio support])
   HAVE_COREAUDIO=yes
-  COREAUDIO_LIBS="-Wl,-framework,CoreAudio"
+  COREAUDIO_LIBS="-Wl,-framework,CoreAudio -Wl,-framework,AudioUnit"
 ])
 
 AC_SUBST(COREAUDIO_LIBS)
@@ -266,7 +292,15 @@ AS_IF([test "${enable_staticlink}" != "no"], [
 ])
 
 AS_IF([test "${enable_pulse}" != "no"], [
-    PKG_CHECK_MODULES(PULSE_DEPS, libpulse-simple, HAVE_PULSE=yes, HAVE_PULSE=no)
+    AS_IF([test "${enable_staticlink}" != "no"], [
+        HAVE_PULSE=yes
+        PULSE_DEPS_LIBS="-lpulse-simple"
+        PULSE_DEPS_CFLAGS="-I../../$LIB/include/"
+        AC_SUBST(DBUS_DEPS_CFLAGS)
+        AC_SUBST(DBUS_DEPS_LIBS)
+    ], [
+        PKG_CHECK_MODULES(PULSE_DEPS, libpulse-simple, HAVE_PULSE=yes, HAVE_PULSE=no)
+    ])
 ])
 
 AC_CHECK_HEADER([iconv.h],[],[iconv.h not found.])
@@ -287,7 +321,9 @@ dnl curl lib
 AS_IF([test "${enable_staticlink}" != "no"], [
     HAVE_CURL=yes
     CURL_LIBS="../../$LIB/lib/libcurl.a -lrt"
+    CURL_CFLAGS="-I../../$LIB/include"
     AC_SUBST(CURL_LIBS)
+    AC_SUBST(CURL_CFLAGS)
 ], [
     AC_CHECK_LIB([curl], [main], [HAVE_CURL=yes])
     CURL_LIBS="-lcurl"
@@ -299,7 +335,9 @@ dnl mpgmad plugin
 AS_IF([test "${enable_mpgmad}" != "no"], [
     AS_IF([test "${enable_staticlink}" != "no"], [
         HAVE_MPGMAD=yes
+        MAD_CFLAGS="-I../../$LIB/include"
         MAD_LIBS="../../$LIB/lib/libmad.a"
+        AC_SUBST(MAD_CFLAGS)
         AC_SUBST(MAD_LIBS)
     ], [
         AC_CHECK_LIB([mad], [main], [HAVE_LIBMAD=yes])
@@ -315,8 +353,10 @@ dnl vorbis plugin
 AS_IF([test "${enable_vorbis}" != "no"], [
     AS_IF([test "${enable_staticlink}" != "no"], [
         HAVE_VORBISPLUGIN=yes
-        VORBIS_LIBS="../../$LIB/lib/libogg.a ../../$LIB/lib/libvorbis.a ../../$LIB/lib/libvorbisenc.a ../../$LIB/lib/libvorbisfile.a"
+        VORBIS_LIBS="-lvorbisfile -lvorbis -lm -logg"
+        VORBIS_CFLAGS="-I../../$LIB/include"
         AC_SUBST(VORBIS_LIBS)
+        AC_SUBST(VORBIS_CFLAGS)
     ], [
         AC_CHECK_LIB([vorbis], [main], [HAVE_VORBIS=yes])
         AC_CHECK_LIB([vorbisfile], [main], [HAVE_VORBISFILE=yes])
@@ -328,11 +368,31 @@ AS_IF([test "${enable_vorbis}" != "no"], [
     ])
 ])
 
+dnl libogg for oggedit
+AS_IF([test "${enable_staticlink}" != "no"], [
+    HAVE_OGG=yes
+    OGG_LIBS="-logg"
+    OGG_CFLAGS="-I../../$LIB/include"
+    AC_SUBST(OGG_LIBS)
+    AC_SUBST(OGG_CFLAGS)
+], [
+    AC_CHECK_LIB([ogg], [main], [HAVE_OGG=yes])
+    AS_IF([test "$HAVE_OGG" = "yes"], [
+        HAVE_VORBISPLUGIN=yes
+        OGG_LIBS="-logg"
+        AC_SUBST(OGG_LIBS)
+    ])
+])
+
+AC_CHECK_LIB([ogg], [ogg_stream_flush_fill], [HAVE_OGG_STREAM_FLUSH_FILL=yes])
+
 dnl flac plugin
 AS_IF([test "${enable_flac}" != "no"], [
     AS_IF([test "${enable_staticlink}" != "no"], [
         HAVE_FLACPLUGIN=yes
-        FLAC_LIBS="../../$LIB/lib/libFLAC.a ../../$LIB/lib/libogg.a"
+        FLAC_CFLAGS="-I../../$LIB/include"
+        FLAC_LIBS="-lFLAC"
+        AC_SUBST(FLAC_CFLAGS)
         AC_SUBST(FLAC_LIBS)
     ], [
         AC_CHECK_LIB([FLAC], [main], [HAVE_FLAC=yes])
@@ -348,7 +408,9 @@ dnl wavpack plugin
 AS_IF([test "${enable_wavpack}" != "no"], [
     AS_IF([test "${enable_staticlink}" != "no"], [
         HAVE_WAVPACKPLUGIN=yes
+        WAVPACK_CFLAGS="-I../../$LIB/include"
         WAVPACK_LIBS="../../$LIB/lib/libwavpack.a"
+        AC_SUBST(WAVPACK_CFLAGS)
         AC_SUBST(WAVPACK_LIBS)
     ], [
         AC_CHECK_LIB([wavpack], [main], [HAVE_WAVPACK=yes])
@@ -364,7 +426,9 @@ dnl libsndfile plugin
 AS_IF([test "${enable_sndfile}" != "no"], [
     AS_IF([test "${enable_staticlink}" != "no"], [
         HAVE_SNDFILEPLUGIN=yes
+        SNDFILE_CFLAGS="-I../../$LIB/include"
         SNDFILE_LIBS="../../$LIB/lib/libsndfile.a"
+        AC_SUBST(SNDFILE_CFLAGS)
         AC_SUBST(SNDFILE_LIBS)
     ], [
         AC_CHECK_LIB([sndfile], [main], [HAVE_SNDFILE=yes])
@@ -382,6 +446,8 @@ AS_IF([test "${enable_vfs_curl}" != "no"], [
         HAVE_VFS_CURL=yes
         VFS_CURL_LIBS="$CURL_LIBS"
         AC_SUBST(VFS_CURL_LIBS)
+        VFS_CURL_CFLAGS="$CURL_CFLAGS"
+        AC_SUBST(VFS_CURL_CFLAGS)
     ])
 ])
 
@@ -420,11 +486,22 @@ AS_IF([test "${enable_ffmpeg}" != "no"], [
 ])
 
 AS_IF([test "${enable_hotkeys}" != "no"], [
-    AC_CHECK_HEADER([X11/Xlib.h], HAVE_XLIB_H=yes)
-    AS_IF([test "${HAVE_XLIB_H}" = "yes"], [
+    AS_IF([test "${enable_staticlink}" != "no"], [
+        HOTKEYS_CFLAGS="-I../../$LIB/include"
         HOTKEYS_LIBS="-lX11"
+        AC_SUBST(HOTKEYS_CFLAGS)
         AC_SUBST(HOTKEYS_LIBS)
         HAVE_HOTKEYS=yes
+    ],
+    [
+        AC_CHECK_HEADER([X11/Xlib.h], HAVE_XLIB_H=yes)
+        AS_IF([test "${HAVE_XLIB_H}" = "yes"], [
+            AS_IF([test "${HAVE_XLIB_H}" = "yes"], [
+                HOTKEYS_LIBS="-lX11"
+                AC_SUBST(HOTKEYS_LIBS)
+                HAVE_HOTKEYS=yes
+            ])
+        ])
     ])
 ])
 
@@ -490,6 +567,11 @@ AS_IF([test "${enable_shellexec}" != "no"], [
     HAVE_SHELLEXEC=yes
 ])
 
+AS_IF([test "${enable_shellexecui}" != "no" -a "${enable_shellexec}" != "no"], [
+    AS_IF([test "${HAVE_GTK2}" = "yes" -o "${HAVE_GTK3}" = "yes"], [
+        HAVE_SHELLEXECUI=yes
+    ])
+])
 
 AS_IF([test "${enable_artwork}" != "no"], [
     AS_IF([test "${enable_staticlink}" != "no"], [
@@ -515,8 +597,12 @@ AS_IF([test "${enable_artwork}" != "no"], [
         ])
     ])
 
-    AS_IF([test "${HAVE_VFS_CURL}" = "yes"], [
-        AS_IF([test "${HAVE_JPEG}" = "yes" -o "${HAVE_IMLIB2}" == "yes"], [
+    AS_IF([test "${enable_artwork_network}" = "yes"], [
+        ARTWORK_USE_VFS_CURL=yes
+    ])
+
+    AS_IF([test "${HAVE_VFS_CURL}" = "yes" -o "${enable_artwork_network}" = "no" ], [
+        AS_IF([test "${HAVE_JPEG}" = "yes" -o "${HAVE_IMLIB2}" = "yes"], [
             HAVE_ARTWORK=yes
         ])
     ])
@@ -542,7 +628,9 @@ AS_IF([test "${enable_nullout}" != "no"], [
 
 AS_IF([test "${enable_src}" != "no"], [
     AS_IF([test "${enable_staticlink}" != "no"], [
+        LIBSAMPLERATE_DEPS_CFLAGS="-I../../$LIB/include"
         LIBSAMPLERATE_DEPS_LIBS="../../$LIB/lib/libsamplerate.a -lpthread ${DL_LIBS}"
+        AC_SUBST(LIBSAMPLERATE_DEPS_CFLAGS)
         AC_SUBST(LIBSAMPLERATE_DEPS_LIBS)
         HAVE_DSP_SRC=yes
     ], [
@@ -591,7 +679,9 @@ AS_IF([test "${enable_dca}" != "no"], [
 
 AS_IF([test "${enable_aac}" != "no"], [
     AS_IF([test "${enable_staticlink}" != "no"], [
+        FAAD2_CFLAGS="-I../../$LIB/include"
         FAAD2_LIBS="../../$LIB/lib/libfaad.a"
+        AC_SUBST(FAAD2_CFLAGS)
         AC_SUBST(FAAD2_LIBS)
         HAVE_AAC=yes
     ], [
@@ -630,12 +720,6 @@ dnl AS_IF([test "${enable_medialib}" != "no"], [
 dnl     HAVE_MEDIALIB=yes
 dnl ])
 
-AS_IF([test "${enable_shellexecui}" != "no"], [
-    AS_IF([test "${HAVE_GTK2}" = "yes" -o "${HAVE_GTK3}" = "yes"], [
-        HAVE_SHELLEXECUI=yes
-    ])
-])
-
 AS_IF([test "${enable_dumb}" != "no"], [
     HAVE_DUMB=yes
 ])
@@ -664,10 +748,12 @@ AS_IF([test "${enable_pltbrowser}" != "no"], [
     HAVE_PLTBROWSER=yes
 ])
 
-PLUGINS_DIRS="plugins/libmp4ff plugins/libparser plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/shellexecui plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio"
+PLUGINS_DIRS="plugins/liboggedit plugins/libmp4ff plugins/libparser plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio"
 
 AM_CONDITIONAL(APE_USE_YASM, test "x$APE_USE_YASM" = "xyes")
 AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes")
+AM_CONDITIONAL(HAVE_OGG, test "x$HAVE_OGG" = "xyes")
+AM_CONDITIONAL(HAVE_OGG_STREAM_FLUSH_FILL, test "x$HAVE_OGG_STREAM_FLUSH_FILL" = "xyes")
 AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_WAVPACK, test "x$HAVE_WAVPACKPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_SNDFILE, test "x$HAVE_SNDFILEPLUGIN" = "xyes")
@@ -679,6 +765,7 @@ AM_CONDITIONAL(HAVE_COREAUDIO, test "x$HAVE_COREAUDIO" = "xyes")
 AM_CONDITIONAL(HAVE_FFMPEG, test "x$HAVE_FFMPEGPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_PULSE, test "x$HAVE_PULSEPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_ARTWORK, test "x$HAVE_ARTWORK" = "xyes")
+AM_CONDITIONAL(ARTWORK_USE_VFS_CURL, test "x$ARTWORK_USE_VFS_CURL" = "xyes")
 AM_CONDITIONAL(HAVE_ADPLUG, test "x$HAVE_ADPLUG" = "xyes")
 AM_CONDITIONAL(HAVE_FFAP, test "x$HAVE_FFAP" = "xyes")
 AM_CONDITIONAL(HAVE_SID, test "x$HAVE_SID" = "xyes")
@@ -693,6 +780,7 @@ AM_CONDITIONAL(HAVE_OSS, test "x$HAVE_OSS" = "xyes")
 AM_CONDITIONAL(HAVE_SUPEREQ, test "x$HAVE_SUPEREQ" = "xyes")
 AM_CONDITIONAL(HAVE_NOTIFY, test "x$HAVE_NOTIFY" = "xyes")
 AM_CONDITIONAL(HAVE_SHELLEXEC, test "x$HAVE_SHELLEXEC" = "xyes")
+AM_CONDITIONAL(HAVE_SHELLEXECUI, test "x$HAVE_SHELLEXECUI" = "xyes")
 AM_CONDITIONAL(HAVE_MUSEPACK, test "x$HAVE_MUSEPACK" = "xyes")
 AM_CONDITIONAL(HAVE_WILDMIDI, test "x$HAVE_WILDMIDI" = "xyes")
 AM_CONDITIONAL(HAVE_TTA, test "x$HAVE_TTA" = "xyes")
@@ -712,7 +800,6 @@ AM_CONDITIONAL(HAVE_DUMB, test "x$HAVE_DUMB" = "xyes")
 AM_CONDITIONAL(HAVE_PSF, test "x$HAVE_PSF" = "xyes")
 AM_CONDITIONAL(HAVE_SHN, test "x$HAVE_SHN" = "xyes")
 AM_CONDITIONAL(HAVE_MONO2STEREO, test "x$HAVE_MONO2STEREO" = "xyes")
-AM_CONDITIONAL(HAVE_SHELLEXECUI, test "x$HAVE_SHELLEXECUI" = "xyes")
 dnl AM_CONDITIONAL(HAVE_SM, test "x$HAVE_SM" = "xyes")
 dnl AM_CONDITIONAL(HAVE_ICE, test "x$HAVE_ICE" = "xyes")
 AM_CONDITIONAL(HAVE_ALAC, test "x$HAVE_ALAC" = "xyes")
@@ -768,12 +855,13 @@ PRINT_PLUGIN_INFO([vfs_curl],[http/ftp streaming support],[test "x$HAVE_VFS_CURL
 PRINT_PLUGIN_INFO([cdda],[cd audio player],[test "x$HAVE_CDDAPLUGIN" = "xyes"])
 PRINT_PLUGIN_INFO([gtkui],[GTK2 user interface],[test "x$HAVE_GTK2" = "xyes"])
 PRINT_PLUGIN_INFO([gtkui3],[GTK3 user interface],[test "x$HAVE_GTK3" = "xyes"])
-PRINT_PLUGIN_INFO([hotkeys],[Global hotkeys support],[test "x$HAVE_HOTKEYS" = "xyes"])
+PRINT_PLUGIN_INFO([hotkeys],[Local and global hotkeys support],[test "x$HAVE_HOTKEYS" = "xyes"])
 PRINT_PLUGIN_INFO([ffmpeg],[ffmpeg codecs],[test "x$HAVE_FFMPEGPLUGIN" = "xyes"])
 PRINT_PLUGIN_INFO([artwork],[Cover art plugin],[test "x$HAVE_ARTWORK" = "xyes"])
 PRINT_PLUGIN_INFO([supereq],[Equalizer based on Super EQ library by Naoki Shibata],[test "x$HAVE_SUPEREQ" = "xyes"])
 PRINT_PLUGIN_INFO([notify],[notification-daemon support plugin],[test "x$HAVE_NOTIFY" = "xyes"])
 PRINT_PLUGIN_INFO([shellexec],[shell commands plugin],[test "x$HAVE_SHELLEXEC" = "xyes"])
+PRINT_PLUGIN_INFO([shellexecui],[GTK user interface for setting up shellexec plugin],[test "x$HAVE_SHELLEXECUI" = "xyes"])
 PRINT_PLUGIN_INFO([musepack],[musepack player plugin],[test "x$HAVE_MUSEPACK" = "xyes"])
 PRINT_PLUGIN_INFO([wildmidi],[WildMidi player plugin],[test "x$HAVE_WILDMIDI" = "xyes"])
 PRINT_PLUGIN_INFO([tta],[TTA player plugin],[test "x$HAVE_TTA" = "xyes"])
@@ -789,7 +877,6 @@ PRINT_PLUGIN_INFO([psf],[PSF format plugin, using AOSDK],[test "x$HAVE_PSF" = "x
 PRINT_PLUGIN_INFO([dumb],[DUMB module plugin, for MOD, S3M, etc],[test "x$HAVE_DUMB" = "xyes"])
 PRINT_PLUGIN_INFO([shn],[SHN plugin based on xmms-shn],[test "x$HAVE_SHN" = "xyes"])
 PRINT_PLUGIN_INFO([mono2stereo],[mono2stereo DSP plugin],[test "x$HAVE_MONO2STEREO" = "xyes"])
-PRINT_PLUGIN_INFO([shellexecui],[GTK user interface for configuring shellexec plugin],[test "x$HAVE_SHELLEXECUI" = "xyes"])
 PRINT_PLUGIN_INFO([alac],[ALAC plugin],[test "x$HAVE_ALAC" = "xyes"])
 PRINT_PLUGIN_INFO([wma],[WMA plugin],[test "x$HAVE_WMA" = "xyes"])
 PRINT_PLUGIN_INFO([pltbrowser],[playlist browser gui plugin],[test "x$HAVE_PLTBROWSER" = "xyes"])
@@ -800,6 +887,7 @@ AC_CONFIG_FILES([
 Makefile
 pixmaps/Makefile
 icons/Makefile
+plugins/liboggedit/Makefile
 plugins/libmp4ff/Makefile
 plugins/libparser/Makefile
 plugins/gme/Makefile
diff --git a/deadbeef.desktop b/deadbeef.desktop
index d6691ed..a0bb7dc 100644
--- a/deadbeef.desktop
+++ b/deadbeef.desktop
@@ -15,6 +15,7 @@ Icon=deadbeef
 X-PulseAudio-Properties=media.role=music
 
 X-Ayatana-Desktop-Shortcuts=Play;Pause;Stop;Next;Prev
+
 [Play Shortcut Group]
 Name=Play
 Exec=deadbeef --play
@@ -39,3 +40,23 @@ TargetEnvironment=Unity
 Name=Prev
 Exec=deadbeef --prev
 TargetEnvironment=Unity
+
+[Desktop Action Play]
+Name=Play
+Exec=deadbeef --play
+
+[Desktop Action Pause]
+Name=Pause
+Exec=deadbeef --pause
+
+[Desktop Action Stop]
+Name=Stop
+Exec=deadbeef --stop
+
+[Desktop Action Next]
+Name=Next
+Exec=deadbeef --next
+
+[Desktop Action Previous]
+Name=Prev
+Exec=deadbeef --prev
diff --git a/deadbeef.desktop.in b/deadbeef.desktop.in
index d6691ed..a0bb7dc 100644
--- a/deadbeef.desktop.in
+++ b/deadbeef.desktop.in
@@ -15,6 +15,7 @@ Icon=deadbeef
 X-PulseAudio-Properties=media.role=music
 
 X-Ayatana-Desktop-Shortcuts=Play;Pause;Stop;Next;Prev
+
 [Play Shortcut Group]
 Name=Play
 Exec=deadbeef --play
@@ -39,3 +40,23 @@ TargetEnvironment=Unity
 Name=Prev
 Exec=deadbeef --prev
 TargetEnvironment=Unity
+
+[Desktop Action Play]
+Name=Play
+Exec=deadbeef --play
+
+[Desktop Action Pause]
+Name=Pause
+Exec=deadbeef --pause
+
+[Desktop Action Stop]
+Name=Stop
+Exec=deadbeef --stop
+
+[Desktop Action Next]
+Name=Next
+Exec=deadbeef --next
+
+[Desktop Action Previous]
+Name=Prev
+Exec=deadbeef --prev
diff --git a/deadbeef.h b/deadbeef.h
index e179cb3..02c5086 100644
--- a/deadbeef.h
+++ b/deadbeef.h
@@ -71,6 +71,8 @@ extern "C" {
 
 // api version history:
 // 9.9 -- devel
+// 1.7 -- deadbeef-0.6.2
+// 1.6 -- deadbeef-0.6.1
 // 1.5 -- deadbeef-0.6
 // 1.4 -- deadbeef-0.5.5
 // 1.3 -- deadbeef-0.5.3
@@ -90,44 +92,69 @@ extern "C" {
 // 0.1 -- deadbeef-0.2.0
 
 #define DB_API_VERSION_MAJOR 1
-#define DB_API_VERSION_MINOR 5
+#define DB_API_VERSION_MINOR 7
+
+#define DDB_DEPRECATED(x)
+
+#ifdef __GNUC__
+// avoid including glibc headers, this is not very portable
+#if defined __GNUC__ && defined __GNUC_MINOR__
+# define __GNUC_PREREQ(maj, min) \
+	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#else
+# define __GNUC_PREREQ(maj, min) 0
+#endif
+#undef DDB_DEPRECATED
+#if __GNUC_PREREQ(4,5)
+#define DDB_DEPRECATED(x) __attribute__ ((deprecated(x)))
+#else
+#define DDB_DEPRECATED(x) __attribute__ ((deprecated))
+#endif
+#endif
+
 
 #ifndef DDB_API_LEVEL
 #define DDB_API_LEVEL DB_API_VERSION_MINOR
 #endif
 
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 6)
+#define DEPRECATED_16 DDB_DEPRECATED("since deadbeef API 1.6")
+#else
+#define DEPRECATED_16
+#endif
+
 #if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 5)
-#define DEPRECATED_15 __attribute__ ((deprecated("since deadbeef API 1.5")))
+#define DEPRECATED_15 DDB_DEPRECATED("since deadbeef API 1.5")
 #else
 #define DEPRECATED_15
 #endif
 
 #if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 4)
-#define DEPRECATED_14 __attribute__ ((deprecated("since deadbeef API 1.4")))
+#define DEPRECATED_14 DDB_DEPRECATED("since deadbeef API 1.4")
 #else
 #define DEPRECATED_14
 #endif
 
 #if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 3)
-#define DEPRECATED_13 __attribute__ ((deprecated("since deadbeef API 1.3")))
+#define DEPRECATED_13 DDB_DEPRECATED("since deadbeef API 1.3")
 #else
 #define DEPRECATED_13
 #endif
 
 #if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 2)
-#define DEPRECATED_12 __attribute__ ((deprecated("since deadbeef API 1.2")))
+#define DEPRECATED_12 DDB_DEPRECATED("since deadbeef API 1.2")
 #else
 #define DEPRECATED_12
 #endif
 
 #if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 1)
-#define DEPRECATED_11 __attribute__ ((deprecated("since deadbeef API 1.1")))
+#define DEPRECATED_11 DDB_DEPRECATED("since deadbeef API 1.1")
 #else
 #define DEPRECATED_11
 #endif
 
 #if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 0)
-#define DEPRECATED __attribute__ ((deprecated))
+#define DEPRECATED DDB_DEPRECATED
 #else
 #define DEPRECATED
 #endif
@@ -1001,6 +1028,11 @@ typedef struct {
     // deselect all tracks in playlist
     void (*plt_deselect_all) (ddb_playlist_t *plt);
 #endif
+    // since 1.6
+#if (DDB_API_LEVEL >= 6)
+    void (*plt_set_scroll) (ddb_playlist_t *plt, int scroll);
+    int (*plt_get_scroll) (ddb_playlist_t *plt);
+#endif
 } DB_functions_t;
 
 // NOTE: an item placement must be selected like this
@@ -1111,7 +1143,7 @@ typedef struct DB_plugin_s {
     // can be NULL
     // NOTE for GUI plugin developers: don't initialize your widgets/windows in
     // the connect method. look for up-to-date information on wiki:
-    // http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Porting_GUI_plugins_to_0.6
+    // http://github.com/Alexey-Yakovenko/deadbeef/wiki/Porting-GUI-plugins-to-deadbeef-from-0.5.x-to-0.6.0
     int (*connect) (void);
 
     // opposite of connect, will be called before stop, while all plugins are still
@@ -1221,6 +1253,15 @@ typedef struct DB_decoder_s {
     // NULL terminated array of all supported prefixes (UADE support needs that)
     // e.g. "mod.song_title"
     const char **prefixes;
+
+#if (DDB_API_LEVEL >= 7)
+    // This function's purpose is to open the file, so that the file handle is
+    // immediately accessible via DB_fileinfo_t, and can be used with fabort.
+    // If a plugin is using open2, it should not reopen the file from init.
+    // Plugins _must_ implement open even if open2 is present,
+    // because existing code may rely on it.
+    DB_fileinfo_t *(*open2) (uint32_t hints, DB_playItem_t *it);
+#endif
 } DB_decoder_t;
 
 // output plugin
@@ -1349,8 +1390,15 @@ typedef struct DB_vfs_s {
     // in icy protocol
     void (*set_track) (DB_FILE *f, DB_playItem_t *it);
 
-// folder access, follows dirent API, and uses dirent data structures
+    // folder access, follows dirent API, and uses dirent data structures
     int (*scandir) (const char *dir, struct dirent ***namelist, int (*selector) (const struct dirent *), int (*cmp) (const struct dirent **, const struct dirent **));
+
+#if (DDB_API_LEVEL >= 6)
+    // returns URI scheme for a given file name, e.g. "zip://"
+    // can be NULL
+    // can return NULL
+    const char *(*get_scheme_for_name) (const char *fname);
+#endif
 } DB_vfs_t;
 
 // gui plugin
@@ -1359,7 +1407,7 @@ typedef struct DB_vfs_s {
 
 // this structure represents a gui dialog with callbacks to set/get params
 // documentation should be available here:
-// https://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Development:Gui_Script
+// http://github.com/Alexey-Yakovenko/deadbeef/wiki/GUI-Script-Syntax
 typedef struct {
     const char *title;
     const char *layout;
@@ -1407,6 +1455,9 @@ typedef struct DB_playlist_s {
 #endif
 } DB_playlist_t;
 
+#undef DDB_DEPRECATED
+#undef DEPRECATED
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/plugins/artwork/escape.c b/escape.c
similarity index 67%
copy from plugins/artwork/escape.c
copy to escape.c
index 3e3653e..3a113d6 100644
--- a/plugins/artwork/escape.c
+++ b/escape.c
@@ -102,3 +102,71 @@ char *uri_escape(const char *string, int inlength)
   ns[strindex]=0; /* terminate it */
   return ns;
 }
+
+#define ISXDIGIT(x) (isxdigit((int) ((unsigned char)x)))
+#define CURL_MASK_UCHAR  0xFF
+
+/*
+** unsigned long to unsigned char
+*/
+
+unsigned char curlx_ultouc(unsigned long ulnum)
+{
+#ifdef __INTEL_COMPILER
+#  pragma warning(push)
+#  pragma warning(disable:810) /* conversion may lose significant bits */
+#endif
+
+  return (unsigned char)(ulnum & (unsigned long) CURL_MASK_UCHAR);
+
+#ifdef __INTEL_COMPILER
+#  pragma warning(pop)
+#endif
+}
+
+char *uri_unescape(const char *string, int length)
+{
+  int alloc = (length?length:(int)strlen(string))+1;
+  char *ns = malloc(alloc);
+  unsigned char in;
+  int strindex=0;
+  unsigned long hex;
+
+  if( !ns )
+    return NULL;
+
+  while(--alloc > 0) {
+    in = *string;
+    if(('%' == in) && ISXDIGIT(string[1]) && ISXDIGIT(string[2])) {
+      /* this is two hexadecimal digits following a '%' */
+      char hexstr[3];
+      char *ptr;
+      hexstr[0] = string[1];
+      hexstr[1] = string[2];
+      hexstr[2] = 0;
+
+      hex = strtoul(hexstr, &ptr, 16);
+
+      in = curlx_ultouc(hex); /* this long is never bigger than 255 anyway */
+
+#ifdef CURL_DOES_CONVERSIONS
+/* escape sequences are always in ASCII so convert them on non-ASCII hosts */
+      if(!handle ||
+          (Curl_convert_from_network(handle, &in, 1) != CURLE_OK)) {
+        /* Curl_convert_from_network calls failf if unsuccessful */
+        free(ns);
+        return NULL;
+      }
+#endif /* CURL_DOES_CONVERSIONS */
+
+      string+=2;
+      alloc-=2;
+    }
+
+    ns[strindex++] = in;
+    string++;
+  }
+  ns[strindex]=0; /* terminate it */
+
+  return ns;
+}
diff --git a/plugins/gtkui/namedicons.h b/escape.h
similarity index 81%
copy from plugins/gtkui/namedicons.h
copy to escape.h
index 5821e8f..7d3be79 100644
--- a/plugins/gtkui/namedicons.h
+++ b/escape.h
@@ -1,6 +1,6 @@
 /*
     DeaDBeeF -- the music player
-    Copyright (C) 2009-2013 Alexey Yakovenko and other contributors
+    Copyright (C) 2009-2014 Alexey Yakovenko and other contributors
 
     This software is provided 'as-is', without any express or implied
     warranty.  In no event will the authors be held liable for any damages
@@ -20,10 +20,10 @@
 
     3. This notice may not be removed or altered from any source distribution.
 */
+#ifndef __ESCAPE_H
+#define __ESCAPE_H
 
-#ifndef __NAMEDICONS_H
-#define __NAMEDICONS_H
-
-extern const char * GtkNamedIcons[];
+char *uri_escape(const char *string, int inlength);
+char *uri_unescape(const char *string, int inlength);
 
 #endif
diff --git a/optmath.h b/fastftoi.h
similarity index 100%
rename from optmath.h
rename to fastftoi.h
diff --git a/handler.c b/handler.c
index d6f1976..13dfec4 100644
--- a/handler.c
+++ b/handler.c
@@ -42,15 +42,15 @@ typedef struct message_s {
 
 typedef struct handler_s {
     int queue_size;
-    message_t pool[1];
     message_t *mfree;
     message_t *mqueue;
     message_t *mqtail;
     uintptr_t mutex;
     uintptr_t cond;
+    message_t pool[1];
 } handler_t;
 
-static void
+void
 handler_reset (handler_t *h) {
     h->mqueue = NULL;
     h->mfree = NULL;
@@ -67,8 +67,10 @@ handler_alloc (int queue_size) {
     int sz = sizeof (handler_t) + (queue_size-1) * sizeof (message_t);
     handler_t *h = malloc (sz);
     memset (h, 0, sz);
+    h->queue_size = queue_size;
     h->mutex = mutex_create ();
     h->cond = cond_create ();
+    handler_reset (h);
     return h;
 }
 
@@ -84,6 +86,9 @@ handler_free (handler_t *h) {
 
 int
 handler_push (handler_t *h, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+    if (!h) {
+        return -1;
+    }
     if (!h->mfree) {
         return -1;
     }
diff --git a/handler.h b/handler.h
index be8b0a8..92dcb77 100644
--- a/handler.h
+++ b/handler.h
@@ -33,6 +33,9 @@ struct handler_s *
 handler_alloc (int queue_size);
 
 void
+handler_reset (struct handler_s *h);
+
+void
 handler_free (struct handler_s *h);
 
 int
diff --git a/help.txt b/help.txt
index 9471ef9..d17762d 100644
--- a/help.txt
+++ b/help.txt
@@ -3,8 +3,8 @@ help file for deadbeef player
 * LINKS
 
     main website: http://deadbeef.sf.net
-    wiki: http://sf.net/apps/mediawiki/deadbeef
-    development website: http://sf.net/projects/deadbeef
+    wiki: http://github.com/Alexey-Yakovenko/deadbeef/wiki
+    development website: http://github.com/Alexey-Yakovenko/deadbeef
     info for contributors: http://contributing.appspot.com/deadbeef
 
 * USEFUL HOTKEYS
diff --git a/icons/Makefile.in b/icons/Makefile.in
index e7aae2d..62ed915 100644
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = icons
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -80,6 +107,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -125,6 +164,7 @@ DATA = $(icon128_DATA) $(icon16_DATA) $(icon192_DATA) $(icon22_DATA) \
 	$(icon24_DATA) $(icon256_DATA) $(icon32_DATA) $(icon36_DATA) \
 	$(icon48_DATA) $(icon64_DATA) $(icon72_DATA) $(icon96_DATA) \
 	$(iconscalable_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -149,6 +189,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -169,10 +210,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -195,6 +238,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -248,6 +292,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -266,6 +311,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -291,13 +338,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -306,7 +357,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -704,11 +757,11 @@ uninstall-iconscalableDATA:
 	@list='$(iconscalable_DATA)'; test -n "$(iconscalabledir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(iconscalabledir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -856,25 +909,25 @@ uninstall-am: uninstall-icon128DATA uninstall-icon16DATA \
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-icon128DATA install-icon16DATA install-icon192DATA \
-	install-icon22DATA install-icon24DATA install-icon256DATA \
-	install-icon32DATA install-icon36DATA install-icon48DATA \
-	install-icon64DATA install-icon72DATA install-icon96DATA \
-	install-iconscalableDATA install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-icon128DATA \
-	uninstall-icon16DATA uninstall-icon192DATA \
-	uninstall-icon22DATA uninstall-icon24DATA \
-	uninstall-icon256DATA uninstall-icon32DATA \
-	uninstall-icon36DATA uninstall-icon48DATA uninstall-icon64DATA \
-	uninstall-icon72DATA uninstall-icon96DATA \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-icon128DATA install-icon16DATA \
+	install-icon192DATA install-icon22DATA install-icon24DATA \
+	install-icon256DATA install-icon32DATA install-icon36DATA \
+	install-icon48DATA install-icon64DATA install-icon72DATA \
+	install-icon96DATA install-iconscalableDATA install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-icon128DATA uninstall-icon16DATA \
+	uninstall-icon192DATA uninstall-icon22DATA \
+	uninstall-icon24DATA uninstall-icon256DATA \
+	uninstall-icon32DATA uninstall-icon36DATA uninstall-icon48DATA \
+	uninstall-icon64DATA uninstall-icon72DATA uninstall-icon96DATA \
 	uninstall-iconscalableDATA
 
 
diff --git a/junklib.c b/junklib.c
index b4962c2..96c3273 100644
--- a/junklib.c
+++ b/junklib.c
@@ -50,6 +50,11 @@ uint16_t sj_to_unicode[] = {
 #include <ctype.h>
 #include <unistd.h>
 #include <assert.h>
+#include <fcntl.h>
+#ifndef __linux__
+#define O_LARGEFILE 0
+#endif
+#include <sys/stat.h>
 #include "playlist.h"
 #include "utf8.h"
 #include "plugins.h"
@@ -57,6 +62,7 @@ uint16_t sj_to_unicode[] = {
 
 int enable_cp1251_detection = 1;
 int enable_cp936_detection = 0;
+int enable_shift_jis_detection = 0;
 
 #define MAX_TEXT_FRAME_SIZE 1024
 #define MAX_CUESHEET_FRAME_SIZE 10000
@@ -136,6 +142,7 @@ static const char *frame_mapping[] = {
     "ORIGINAL_RELEASE_TIME", NULL, "TDOR", NULL, NULL,
     "MOOD", NULL, "TMOO", NULL, NULL,
     "PRODUCED_NOTICE", NULL, "TPRO", NULL, NULL,
+    "musicbrainz_trackid", NULL, NULL, NULL, NULL,
     NULL
 };
 
@@ -483,7 +490,7 @@ junk_iconv (const char *in, int inlen, char *out, int outlen, const char *cs_in,
     int err = errno;
     iconv_close (cd);
 
-    //trace ("iconv -f %s -t %s '%s': returned %d, inbytes %d/%d, outbytes %d/%d, errno=%d\n", cs_in, cs_out, in, res, inlen, inbytesleft, outlen, outbytesleft, err);
+    //trace ("iconv -f %s -t %s '%s': returned %d, inbytes %d/%d, outbytes %d/%d, errno=%d\n", cs_in, cs_out, in, (int)res, inlen, (int)inbytesleft, outlen, (int)outbytesleft, err);
     if (res == -1) {
         return -1;
     }
@@ -710,6 +717,37 @@ can_be_chinese (const uint8_t *str, int sz) {
     return 0;
 }
 
+static int
+can_be_shift_jis (const unsigned char *str, int size) {
+    unsigned char out[size*4];
+
+    if (size < 2) {
+        return 0;
+    }
+
+    const unsigned char *p = str;
+    int s = size;
+    while (s >= 2) {
+        if ((((p[0] >= 0x81 && p[0] <= 0x84) || (p[0] >= 0x87 && p[0] <= 0x9f))
+                    && ((p[1] >= 0x40 && p[1] <= 0x9e) || (p[1] >= 0x9f && p[1] <= 0xfc)))
+                || ((p[0] >= 0xe0 && p[0] <= 0xef)
+                    && ((p[1] >= 0x40 && p[1] <= 0x9e) || (p[1] >= 0x9f && p[1] <= 0xfc)))) {
+            break;
+        }
+        s--;
+        p++;
+    }
+
+    if (s >= 2) {
+        if (junk_iconv (str, size, out, sizeof (out), "shift-jis", UTF8_STR) >= 0) {
+            return 1;
+        }
+    }
+    return 0;
+
+}
+
+
 static char *
 convstr_id3v2 (int version, uint8_t encoding, const unsigned char* str, int sz) {
     char out[2048] = "";
@@ -792,7 +830,10 @@ convstr_id3v2 (int version, uint8_t encoding, const unsigned char* str, int sz)
 }
 
 static const char *
-convstr_id3v1 (const char* str, int sz) {
+convstr_id3v1 (const char* str, int sz, const char *charset) {
+    if (!charset) {
+        return str;
+    }
     static char out[2048];
     int i;
     for (i = 0; i < sz; i++) {
@@ -805,22 +846,7 @@ convstr_id3v1 (const char* str, int sz) {
         return out;
     }
 
-    // check for valid utf8
-    int valid = u8_valid (str, sz, NULL);
-    if (valid) {
-        return str;
-    }
-    const char *enc = "iso8859-1";
-    if (can_be_chinese (str, sz)) {
-        // hack to add cp936 support
-        enc = "cp936";
-    }
-    else if (can_be_russian (str, sz)) {
-        // hack to add limited cp1251 recoding support
-        enc = "cp1251";
-    }
-
-    int len = junk_iconv (str, sz, out, sizeof (out), enc, UTF8_STR);
+    int len = junk_iconv (str, sz, out, sizeof (out), charset, UTF8_STR);
     if (len >= 0) {
         return out;
     }
@@ -837,24 +863,28 @@ str_trim_right (uint8_t *str, int len) {
     *p = 0;
 }
 
-// should read both id3v1 and id3v1.1
 int
-junk_id3v1_read (playItem_t *it, DB_FILE *fp) {
-    if (!it || !fp) {
-        trace ("bad call to junk_id3v1_read!\n");
+junk_id3v1_read_int (playItem_t *it, char *buffer, const char **charset) {
+    if (!buffer) {
         return -1;
     }
-    uint8_t buffer[128];
-    // try reading from end
-    if (deadbeef->fseek (fp, -128, SEEK_END) == -1) {
-        return -1;
+
+    if (it) {
+        if (memcmp (buffer, "TAG", 3)) {
+            return -1; // no tag
+        }
+        const char *cs = NULL;
+        charset = &cs;
+        int res = junk_id3v1_read_int (NULL, buffer, charset);
+        if (res) {
+            return res;
+        }
     }
-    if (deadbeef->fread (buffer, 1, 128, fp) != 128) {
+
+    if (!charset) {
         return -1;
     }
-    if (memcmp (buffer, "TAG", 3)) {
-        return -1; // no tag
-    }
+
     char title[31];
     char artist[31];
     char album[31];
@@ -880,39 +910,57 @@ junk_id3v1_read (playItem_t *it, DB_FILE *fp) {
     str_trim_right (comment, 30);
     genreid = buffer[3+124];
     tracknum = 0;
-    if (comment[28] == 0 && comment[29] != 0) {
-        tracknum = comment[29];
-    }
-//    255 = "None",
-//    "CR" = "Cover" (id3v2)
-//    "RX" = "Remix" (id3v2)
+    if (it) {
+        if (comment[28] == 0 && comment[29] != 0) {
+            tracknum = comment[29];
+        }
 
-    if (genreid == 0xff) {
-        //genre = "None";
-    }
-    else if (genreid <= 147) {
-        genre = junk_genretbl[genreid];
+        // 255 = "None",
+        // "CR" = "Cover" (id3v2)
+        // "RX" = "Remix" (id3v2)
+        if (genreid == 0xff) {
+            //genre = "None";
+        }
+        else if (genreid <= 147) {
+            genre = junk_genretbl[genreid];
+        }
     }
 
     // add meta
 //    trace ("%s - %s - %s - %s - %s - %s\n", title, artist, album, year, comment, genre);
+    if (!it) {
+        char buf[129];
+        char *p = buf;
+        strcpy (p, title);
+        p += strlen (title);
+        strcpy (p, artist);
+        p += strlen (artist);
+        strcpy (p, album);
+        p += strlen (album);
+        strcpy (p, year);
+        p += strlen (year);
+        strcpy (p, comment);
+        *charset = junk_detect_charset (buf);
+        return 0;
+    }
+
     if (*title) {
-        pl_add_meta (it, "title", convstr_id3v1 (title, strlen (title)));
+        pl_add_meta (it, "title", convstr_id3v1 (title, strlen (title), *charset));
     }
     if (*artist) {
-        pl_add_meta (it, "artist", convstr_id3v1 (artist, strlen (artist)));
+        pl_add_meta (it, "artist", convstr_id3v1 (artist, strlen (artist), *charset));
     }
     if (*album) {
-        pl_add_meta (it, "album", convstr_id3v1 (album, strlen (album)));
+        pl_add_meta (it, "album", convstr_id3v1 (album, strlen (album), *charset));
     }
     if (*year) {
         pl_add_meta (it, "year", year);
     }
     if (*comment) {
-        pl_add_meta (it, "comment", convstr_id3v1 (comment, strlen (comment)));
+        pl_add_meta (it, "comment", convstr_id3v1 (comment, strlen (comment), *charset));
     }
     if (genre && *genre) {
-        pl_add_meta (it, "genre", convstr_id3v1 (genre, strlen (genre)));
+        pl_add_meta (it, "genre", convstr_id3v1 (genre, strlen (genre), *charset));
     }
     if (tracknum != 0) {
         char s[4];
@@ -927,6 +975,121 @@ junk_id3v1_read (playItem_t *it, DB_FILE *fp) {
     return 0;
 }
 
+// should read both id3v1 and id3v1.1
+int
+junk_id3v1_read (playItem_t *it, DB_FILE *fp) {
+    uint8_t id3[128];
+
+    if (deadbeef->fseek (fp, -128, SEEK_END) == -1) {
+        return -1;
+    }
+    if (deadbeef->fread (id3, 1, 128, fp) != 128) {
+        return -1;
+    }
+
+    return junk_id3v1_read_int (it, id3, NULL);
+}
+
+int
+junk_id3v1_write2 (int fd, playItem_t *it, const char *enc) {
+    char title[30] = "";
+    char artist[30] = "";
+    char album[30] = "";
+    char year[4] = "";
+    char comment[28] = "";
+    uint8_t genreid = 0xff;
+    uint8_t tracknum = 0;
+
+    const char *meta;
+
+    pl_lock ();
+
+#define conv(name, store) {\
+    memset (store, 0x20, sizeof (store));\
+    meta = pl_find_meta (it, name);\
+    if (meta) {\
+        char temp[1000];\
+        int l = junk_iconv (meta, strlen (meta), temp, sizeof (temp), UTF8_STR, enc);\
+        if (l == -1) {\
+            memset (store, 0, sizeof (store));\
+        }\
+        else {\
+            strncpy (store, temp, sizeof (store));\
+        }\
+        char *cr = strchr (store, '\n');\
+        if (cr) {\
+            *cr = 0;\
+        }\
+    }\
+}
+
+    conv ("title", title);
+    conv ("artist", artist);
+    conv ("album", album);
+    conv ("year", year);
+    conv ("comment", comment);
+
+#undef conv
+
+    // tracknum
+    meta = pl_find_meta (it, "track");
+    if (meta) {
+        tracknum = atoi (meta);
+    }
+
+    // find genre
+    meta = pl_find_meta (it, "genre");
+    if (meta) {
+        for (int i = 0; junk_genretbl[i]; i++) {
+            if (!strcasecmp (meta, junk_genretbl[i])) {
+                genreid = i;
+                break;
+            }
+        }
+    }
+
+    pl_unlock ();
+
+    if (write (fd, "TAG", 3) != 3) {
+        trace ("junk_id3v1_write: failed to write signature\n");
+        return -1;
+    }
+    if (write (fd, title, sizeof (title)) != sizeof (title)) {
+        trace ("junk_id3v1_write: failed to write title\n");
+        return -1;
+    }
+    if (write (fd, artist, sizeof (artist)) != sizeof (artist)) {
+        trace ("junk_id3v1_write: failed to write artist\n");
+        return -1;
+    }
+    if (write (fd, album, sizeof (album)) != sizeof (album)) {
+        trace ("junk_id3v1_write: failed to write album\n");
+        return -1;
+    }
+    if (write (fd, year, sizeof (year)) != sizeof (year)) {
+        trace ("junk_id3v1_write: failed to write year\n");
+        return -1;
+    }
+    if (write (fd, comment, sizeof (comment)) != sizeof (comment)) {
+        trace ("junk_id3v1_write: failed to write comment\n");
+        return -1;
+    }
+    uint8_t zero = 0;
+    if (write (fd, &zero, 1) != 1) {
+        trace ("junk_id3v1_write: failed to write id3v1.1 marker\n");
+        return -1;
+    }
+    if (write (fd, &tracknum, 1) != 1) {
+        trace ("junk_id3v1_write: failed to write track\n");
+        return -1;
+    }
+    if (write (fd, &genreid, 1) != 1) {
+        trace ("junk_id3v1_write: failed to write genre\n");
+        return -1;
+    }
+    return 0;
+}
+
 int
 junk_id3v1_write (FILE *fp, playItem_t *it, const char *enc) {
     char title[30] = "";
@@ -1027,8 +1190,8 @@ junk_id3v1_write (FILE *fp, playItem_t *it, const char *enc) {
     return 0;
 }
 
-int
-junk_id3v1_find (DB_FILE *fp) {
+int64_t
+junk_id3v1_find2 (DB_FILE *fp) {
     uint8_t buffer[3];
     if (deadbeef->fseek (fp, -128, SEEK_END) == -1) {
         return -1;
@@ -1043,7 +1206,17 @@ junk_id3v1_find (DB_FILE *fp) {
 }
 
 int
-junk_apev2_find (DB_FILE *fp, int32_t *psize, uint32_t *pflags, uint32_t *pnumitems) {
+junk_id3v1_find (DB_FILE *fp) {
+    int64_t pos = junk_id3v1_find2 (fp);
+    // 32 bit overflow protection
+    if (pos > 0x7fffffff) {
+        return -1;
+    }
+    return pos;
+}
+
+int64_t
+junk_apev2_find2 (DB_FILE *fp, int32_t *psize, uint32_t *pflags, uint32_t *pnumitems) {
     uint8_t header[32];
     if (deadbeef->fseek (fp, -32, SEEK_END) == -1) {
         return -1; // something bad happened
@@ -1089,6 +1262,16 @@ junk_apev2_find (DB_FILE *fp, int32_t *psize, uint32_t *pflags, uint32_t *pnumit
 }
 
 int
+junk_apev2_find (DB_FILE *fp, int32_t *psize, uint32_t *pflags, uint32_t *pnumitems) {
+    int64_t pos = junk_apev2_find2 (fp, psize, pflags, pnumitems);
+    // 32 bit overflow protection
+    if (pos > 0x7fffffff) {
+        return -1;
+    }
+    return pos;
+}
+
+int
 junk_find_id3v1 (DB_FILE *fp) {
     if (deadbeef->fseek (fp, -128, SEEK_END) == -1) {
         return -1;
@@ -1783,7 +1966,6 @@ junk_id3v2_add_txxx_frame (DB_id3v2_tag_t *tag, const char *key, const char *val
     }
 
     return f;
-
 }
 
 // TODO: some non-Txxx frames might still need charset conversion
@@ -1910,11 +2092,11 @@ junk_id3v2_convert_24_to_23 (DB_id3v2_tag_t *tag24, DB_id3v2_tag_t *tag23) {
         flags[0] = f24->flags[0] << 1;
         
         // 2nd byte (format flags) is quite different
-        // 2.4 format is %0h00kmnp (grouping, compression, encryption, unsync)
-        // 2.3 format is %ijk00000 (compression, encryption, grouping)
+        // 2.4 format is %0h00kmnp (6:grouping, 3:compression, 2:encryption, 1:unsync, 0:datalen)
+        // 2.3 format is %ijk00000 (7:compression, 6:encryption, 5:grouping)
         flags[1] = 0;
         if (f24->flags[1] & (1 << 6)) {
-            flags[1] |= (1 << 4);
+            flags[1] |= (1 << 5);
         }
         if (f24->flags[1] & (1 << 3)) {
             flags[1] |= (1 << 7);
@@ -1923,19 +2105,26 @@ junk_id3v2_convert_24_to_23 (DB_id3v2_tag_t *tag24, DB_id3v2_tag_t *tag23) {
             flags[1] |= (1 << 6);
         }
         if (f24->flags[1] & (1 << 1)) {
-            flags[1] |= (1 << 5);
-        }
-        if (f24->flags[1] & 1) {
             // 2.3 doesn't support per-frame unsyncronyzation
-            // let's ignore it
+        }
+        if (f24->flags[1] & (1 << 0)) {
+            // 2.3 doesn't support data length, but remember to skip 4 bytes of
+            // the frame
         }
 
         if (simplecopy) {
             f23 = malloc (sizeof (DB_id3v2_frame_t) + f24->size);
             memset (f23, 0, sizeof (DB_id3v2_frame_t) + f24->size);
             strcpy (f23->id, f24->id);
-            f23->size = f24->size;
-            memcpy (f23->data, f24->data, f24->size);
+            if (f24->flags[1] & (1<<0)) {
+                // skip 1st 4 bytes (2.4 data length indicator)
+                memcpy (f23->data, f24->data+4, f24->size-4);
+                f23->size = f24->size-4;
+            }
+            else {
+                f23->size = f24->size;
+                memcpy (f23->data, f24->data, f24->size);
+            }
             f23->flags[0] = flags[0];
             f23->flags[1] = flags[1];
         }
@@ -2095,12 +2284,9 @@ junk_id3v2_convert_23_to_24 (DB_id3v2_tag_t *tag23, DB_id3v2_tag_t *tag24) {
         flags[0] = f23->flags[0] >> 1;
         
         // 2nd byte (format flags) is quite different
-        // 2.4 format is %0h00kmnp (grouping, compression, encryption, unsync)
-        // 2.3 format is %ijk00000 (compression, encryption, grouping)
+        // 2.4 format is %0h00kmnp (6:grouping, 3:compression, 2:encryption, 1:unsync, 0:datalen)
+        // 2.3 format is %ijk00000 (7:compression, 6:encryption, 5:grouping)
         flags[1] = 0;
-        if (f23->flags[1] & (1 << 4)) {
-            flags[1] |= (1 << 6);
-        }
         if (f23->flags[1] & (1 << 7)) {
             flags[1] |= (1 << 3);
         }
@@ -2108,7 +2294,7 @@ junk_id3v2_convert_23_to_24 (DB_id3v2_tag_t *tag23, DB_id3v2_tag_t *tag24) {
             flags[1] |= (1 << 2);
         }
         if (f23->flags[1] & (1 << 5)) {
-            flags[1] |= (1 << 1);
+            flags[1] |= (1 << 6);
         }
 
         DB_id3v2_frame_t *f24 = NULL;
@@ -2602,6 +2788,20 @@ junk_id3v2_convert_apev2_to_24 (DB_apev2_tag_t *ape, DB_id3v2_tag_t *tag24) {
 }
 
 int
+junk_apev2_write_i32_le2 (int fd, uint32_t data) {
+    int shift = 0;
+    for (int i = 0; i < 4; i++) {
+        uint8_t d = (data >> shift) & 0xff;
+        if (write (fd, &d, 1) != 1) {
+            return -1;
+        }
+        shift += 8;
+    }
+
+    return 0;
+}
+
+int
 junk_apev2_write_i32_le (FILE *fp, uint32_t data) {
     int shift = 0;
     for (int i = 0; i < 4; i++) {
@@ -2616,6 +2816,108 @@ junk_apev2_write_i32_le (FILE *fp, uint32_t data) {
 }
 
 int
+junk_apev2_write2 (int fd, DB_apev2_tag_t *tag, int write_header, int write_footer) {
+    // calc size and numitems
+    uint32_t numframes = 0;
+    uint32_t size = 0;
+    DB_apev2_frame_t *f = tag->frames;
+    while (f) {
+        size += 8 + strlen (f->key) + 1 + f->size;
+        numframes++;
+        f = f->next;
+    }
+    size += 32;
+
+    trace ("junk_apev2_write2: writing apev2 tag, size=%d, numframes=%d\n", size, numframes);
+
+
+    if (write_header) {
+        if (write (fd, "APETAGEX", 8) != 8) {
+            trace ("junk_apev2_write2: failed to write apev2 header signature\n");
+            goto error;
+        }
+        uint32_t flags = (1 << 31) | (1 << 29); // contains header, this is header
+        if (!write_footer) {
+            flags |= 1 << 30; // contains no footer
+        }
+        uint32_t header[4] = {
+            2000, // version
+            size,
+            numframes,
+            flags
+        };
+        for (int i = 0; i < 4; i++) {
+            if (junk_apev2_write_i32_le2 (fd, header[i]) != 0) {
+                trace ("junk_apev2_write_i32_le2: failed to write apev2 header\n");
+                goto error;
+            }
+        }
+        // write 8 bytes of padding
+        header[0] = header[1] = 0;
+        if (write (fd, header, 8) != 8) {
+            trace ("junk_apev2_write2: failed to write apev2 header padding\n");
+            goto error;
+        }
+    }
+
+    // write items
+    f = tag->frames;
+    while (f) {
+        if (junk_apev2_write_i32_le2 (fd, f->size) != 0) {
+            trace ("junk_apev2_write_i32_le2: failed to write apev2 item size\n");
+            goto error;
+        }
+        if (junk_apev2_write_i32_le2 (fd, f->flags) != 0) {
+            trace ("junk_apev2_write_i32_le2: failed to write apev2 item flags\n");
+            goto error;
+        }
+        int l = strlen (f->key) + 1;
+        if (write (fd, f->key, l) != l) {
+            trace ("junk_apev2_write2: failed to write apev2 item key\n");
+            goto error;
+        }
+        if (write (fd, f->data, f->size) != f->size) {
+            trace ("junk_apev2_write2: failed to write apev2 item value\n");
+            goto error;
+        }
+        f = f->next;
+    }
+
+    if (write_footer) {
+        if (write (fd, "APETAGEX", 8) != 8) {
+            trace ("junk_apev2_write: failed to write apev2 footer signature\n");
+            goto error;
+        }
+        uint32_t flags = 0;
+        if (write_header) {
+            flags |= 1 << 31;
+        }
+        uint32_t header[4] = {
+            2000, // version
+            size,
+            numframes,
+            flags
+        };
+        for (int i = 0; i < 4; i++) {
+            if (junk_apev2_write_i32_le2 (fd, header[i]) != 0) {
+                trace ("junk_apev2_write_i32_le2: failed to write apev2 footer\n");
+                goto error;
+            }
+        }
+        // write 8 bytes of padding
+        header[0] = header[1] = 0;
+        if (write (fd, header, 8) != 8) {
+            trace ("junk_apev2_write2: failed to write apev2 footer padding\n");
+            goto error;
+        }
+    }
+    return 0;
+error:
+    return -1;
+}
+
+
+int
 junk_apev2_write (FILE *fp, DB_apev2_tag_t *tag, int write_header, int write_footer) {
     // calc size and numitems
     uint32_t numframes = 0;
@@ -2717,6 +3019,108 @@ error:
 }
 
 int
+junk_id3v2_write2 (int out, DB_id3v2_tag_t *tag) {
+    if (tag->version[0] < 3) {
+        fprintf (stderr, "junk_write_id3v2: writing id3v2.2 is not supported\n");
+        return -1;
+    }
+
+    FILE *fp = NULL;
+    char *buffer = NULL;
+    int err = -1;
+
+    // write tag header
+    if (write (out, "ID3", 3) != 3) {
+        fprintf (stderr, "junk_write_id3v2: failed to write ID3 signature\n");
+        goto error;
+    }
+
+    if (write (out, tag->version, 2) != 2) {
+        fprintf (stderr, "junk_write_id3v2: failed to write tag version\n");
+        goto error;
+    }
+    uint8_t flags = tag->flags;
+    flags &= ~(1<<6); // we don't (yet?) write ext header
+    flags &= ~(1<<4); // we don't write footer
+
+    if (write (out, &flags, 1) != 1) {
+        fprintf (stderr, "junk_write_id3v2: failed to write tag flags\n");
+        goto error;
+    }
+    // run through list of frames, and calculate size
+    uint32_t sz = 0;
+    for (DB_id3v2_frame_t *f = tag->frames; f; f = f->next) {
+        // each tag has 10 bytes header
+        if (tag->version[0] > 2) {
+            sz += 10;
+        }
+        else {
+            sz += 6;
+        }
+        sz += f->size;
+    }
+
+    trace ("calculated tag size: %d bytes\n", sz);
+    uint8_t tagsize[4];
+    tagsize[0] = (sz >> 21) & 0x7f;
+    tagsize[1] = (sz >> 14) & 0x7f;
+    tagsize[2] = (sz >> 7) & 0x7f;
+    tagsize[3] = sz & 0x7f;
+    if (write (out, tagsize, 4) != 4) {
+        fprintf (stderr, "junk_write_id3v2: failed to write tag size\n");
+        goto error;
+    }
+
+    trace ("writing frames\n");
+    // write frames
+    for (DB_id3v2_frame_t *f = tag->frames; f; f = f->next) {
+        trace ("writing frame %s size %d\n", f->id, f->size);
+        int id_size = 3;
+        uint8_t frame_size[4];
+        if (tag->version[0] > 2) {
+            id_size = 4;
+        }
+        if (tag->version[0] == 3) {
+            frame_size[0] = (f->size >> 24) & 0xff;
+            frame_size[1] = (f->size >> 16) & 0xff;
+            frame_size[2] = (f->size >> 8) & 0xff;
+            frame_size[3] = f->size & 0xff;
+        }
+        else if (tag->version[0] == 4) {
+            frame_size[0] = (f->size >> 21) & 0x7f;
+            frame_size[1] = (f->size >> 14) & 0x7f;
+            frame_size[2] = (f->size >> 7) & 0x7f;
+            frame_size[3] = f->size & 0x7f;
+        }
+        if (write (out, f->id, 4) != 4) {
+            fprintf (stderr, "junk_write_id3v2: failed to write frame id %s\n", f->id);
+            goto error;
+        }
+        if (write (out, frame_size, 4) != 4) {
+            fprintf (stderr, "junk_write_id3v2: failed to write frame size, id %s, size %d\n", f->id, f->size);
+            goto error;
+        }
+        if (write (out, f->flags, 2) != 2) {
+            fprintf (stderr, "junk_write_id3v2: failed to write frame header flags, id %s, size %d\n", f->id, f->size);
+            goto error;
+        }
+        if (write (out, f->data, f->size) != f->size) {
+            fprintf (stderr, "junk_write_id3v2: failed to write frame data, id %s, size %d\n", f->id, f->size);
+            goto error;
+        }
+        sz += f->size;
+    }
+
+    return 0;
+
+error:
+    if (buffer) {
+        free (buffer);
+    }
+    return err;
+}
+
+int
 junk_id3v2_write (FILE *out, DB_id3v2_tag_t *tag) {
     if (tag->version[0] < 3) {
         fprintf (stderr, "junk_write_id3v2: writing id3v2.2 is not supported\n");
@@ -2968,6 +3372,85 @@ static int junk_id3v2_load_rva2 (int version_major, playItem_t *it, uint8_t *rea
 }
 
 int
+junk_id3v2_load_ufid (int version_major, playItem_t *it, uint8_t *readptr, int synched_size) {
+    char *owner = readptr;
+    while (*readptr && synched_size > 0) {
+        readptr++;
+        synched_size--;
+    }
+    if (!synched_size) {
+        trace ("UFID owner is not null-terminated\n");
+        return -1;
+    }
+    readptr++;
+    synched_size--;
+    char id[synched_size+1];
+    memcpy (id, readptr, synched_size);
+    id[synched_size] = 0;
+
+    // verify that owner is musicbrainz and that content is ascii
+    if (strcmp (owner, "http://musicbrainz.org")) {
+        return -1;
+    }
+    for (int i = 0; i < synched_size; i++) {
+        if (!isascii (id[i])) {
+            return -1;
+        }
+    }
+
+    pl_replace_meta (it, "musicbrainz_trackid", id);
+    return 0;
+}
+
+int
+junk_id3v2_remove_ufid_frames (DB_id3v2_tag_t *tag, const char *frame_id, const char *owner) {
+    DB_id3v2_frame_t *prev = NULL;
+    for (DB_id3v2_frame_t *f = tag->frames; f; ) {
+        DB_id3v2_frame_t *next = f->next;
+        if (!strcmp (f->id, frame_id) && f->size >= strlen(owner) && !strcmp (f->data, owner)) {
+            if (prev) {
+                prev->next = f->next;
+            }
+            else {
+                tag->frames = f->next;
+            }
+            free (f);
+        }
+        else {
+            prev = f;
+        }
+        f = next;
+    }
+    return 0;
+}
+
+DB_id3v2_frame_t *
+junk_id3v2_add_ufid_frame (DB_id3v2_tag_t *tag, const char *owner, const char *id, int id_len) {
+    int ownerlen = strlen (owner);
+    int len = ownerlen + 1 + id_len;
+
+    // make a frame
+    trace ("calculated frame size = %d\n", len);
+    DB_id3v2_frame_t *f = malloc (len + sizeof (DB_id3v2_frame_t));
+    memset (f, 0, sizeof (DB_id3v2_frame_t));
+    strcpy (f->id, "UFID");
+    f->size = len;
+    memcpy (f->data, owner, ownerlen+1);
+    memcpy (f->data+ownerlen+1, id, id_len);
+    // append to tag
+    DB_id3v2_frame_t *tail;
+    for (tail = tag->frames; tail && tail->next; tail = tail->next);
+    if (tail) {
+        tail->next = f;
+    }
+    else {
+        tag->frames = f;
+    }
+
+    return f;
+}
+
+int
 junk_id3v2_load_txx (int version_major, playItem_t *it, uint8_t *readptr, int synched_size) {
     char *txx = convstr_id3v2 (version_major, *readptr, readptr+1, synched_size-1);
     if (!txx) {
@@ -3204,12 +3687,6 @@ junk_id3v2_read_full (playItem_t *it, DB_id3v2_tag_t *tag_store, DB_FILE *fp) {
             if (unsync) {
                 synched_size = junklib_id3v2_sync_frame (readptr, sz);
                 trace ("size: %d/%d\n", synched_size, sz);
-
-#if 0 // that was a workaround for corrupted unsynced tag, do not use
-                if (synched_size != sz) {
-                    sz = sz + (sz-synched_size);
-                }
-#endif
             }
 
             if (tag_store) {
@@ -3366,6 +3843,14 @@ junk_id3v2_read_full (playItem_t *it, DB_id3v2_tag_t *tag_store, DB_FILE *fp) {
 
                     /*int res = */junk_id3v2_load_rva2(version_major, it, readptr, synched_size);
                 }
+                else if (it && !strcmp (frameid, "UFID")) {
+                    if (synched_size < 2) {
+                        trace ("UFID frame is too short, skipped\n");
+                        readptr += sz; // bad tag
+                        continue;
+                    }
+                    junk_id3v2_load_ufid (version_major, it, readptr, synched_size);
+                }
                 else if (it && !strcmp (frameid, "TXXX")) {
                     if (synched_size < 2) {
                         trace ("TXXX frame is too short, skipped\n");
@@ -3521,22 +4006,39 @@ junk_id3v2_read (playItem_t *it, DB_FILE *fp) {
 }
 
 const char *
-junk_detect_charset (const char *s) {
+junk_detect_charset_len (const char *s, int len) {
     // check if that's already utf8
-    if (u8_valid (s, strlen (s), NULL)) {
+    if (u8_valid (s, len, NULL)) {
         return NULL; // means no recoding required
     }
+    // try shift-jis
+    if (enable_shift_jis_detection && can_be_shift_jis (s, len)) {
+        return "shift-jis";
+    }
     // hack to add cp936 support
-    if (can_be_chinese (s, strlen (s))) {
+    if (can_be_chinese (s, len)) {
        return "cp936";
     }
     // check if that could be non-latin1 (too many nonascii chars)
-    if (can_be_russian (s, strlen (s))) {
+    if (can_be_russian (s, len)) {
         return "cp1251";
     }
+
+    // if shift_jis detection is disabled, but russian and chinese failed,
+    // try it anyway
+    if (!enable_shift_jis_detection && can_be_shift_jis (s, len)) {
+        return "shift_jis";
+    }
+
     return "cp1252";
 }
 
+const char *
+junk_detect_charset (const char *s) {
+    size_t len = strlen (s);
+    return junk_detect_charset_len (s, len);
+}
+
 int
 junk_recode (const char *in, int inlen, char *out, int outlen, const char *cs) {
     return junk_iconv (in, inlen, out, outlen, cs, UTF8_STR);
@@ -3548,7 +4050,7 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
     int err = -1;
     char *buffer = NULL;
     DB_FILE *fp = NULL;
-    FILE *out = NULL;
+    int out = -1;
 
     uint32_t item_flags = pl_get_item_flags (it);
 
@@ -3571,7 +4073,7 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
         return -1;
     }
 
-    int fsize = deadbeef->fgetlength (fp);
+    int64_t fsize = deadbeef->fgetlength (fp);
     int id3v2_size = 0;
     int id3v2_start = deadbeef->junk_id3v2_find (fp, &id3v2_size);
     if (id3v2_start == -1) {
@@ -3580,7 +4082,7 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
 
     int32_t apev2_size;
     uint32_t flags, numitems;
-    int apev2_start = deadbeef->junk_apev2_find (fp, &apev2_size, &flags, &numitems);
+    int64_t apev2_start = junk_apev2_find2 (fp, &apev2_size, &flags, &numitems);
     if (apev2_start == -1) {
         apev2_start = 0;
     }
@@ -3589,17 +4091,17 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
         apev2_start = 0;
     }
 
-    int id3v1_start = deadbeef->junk_id3v1_find (fp);
+    int64_t id3v1_start = junk_id3v1_find2 (fp);
     if (id3v1_start == -1) {
         id3v1_start = 0;
     }
 
-    int header = 0;
+    int64_t header = 0;
     if (id3v2_size > 0) {
         header = id3v2_start + id3v2_size;
     }
 
-    int footer = fsize;
+    int64_t footer = fsize;
 
     if (id3v1_start > 0) {
         footer = id3v1_start;
@@ -3608,17 +4110,19 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
         footer = min (footer, apev2_start);
     }
 
-    trace ("header size: %d, footer size: %d\n", header, fsize-footer);
+    trace ("header size: %lld, footer size: %lld\n", header, fsize-footer);
 
     // "TRCK" -- special case
     // "TYER"/"TDRC" -- special case
 
     // open output file
-    out = NULL;
-
-    out = fopen (tmppath, "w+b");
+    struct stat stat_struct;
+    if (stat(fname, &stat_struct) != 0) {
+        stat_struct.st_mode = 00640;
+    }
+    out = open (tmppath, O_CREAT | O_LARGEFILE | O_WRONLY, stat_struct.st_mode);
     trace ("will write tags into %s\n", tmppath);
-    if (!out) {
+    if (out < 0) {
         fprintf (stderr, "cmp3_write_metadata: failed to open temp file %s\n", tmppath);
         goto error;
     }
@@ -3644,7 +4148,7 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
             free (buf);
             goto error;
         }
-        if (fwrite (buf, 1, id3v2_size, out) != id3v2_size) {
+        if (write (out, buf, id3v2_size) != id3v2_size) {
             trace ("cmp3_write_metadata: failed to copy original id3v2 tag from %s to temp file\n", pl_find_meta (it, ":URI"));
             free (buf);
             goto error;
@@ -3690,15 +4194,20 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
 
         junk_id3v2_remove_all_txxx_frames (&id3v2);
 
-        // COMM
-        junk_id3v2_remove_frames (&id3v2, "COMM");
         pl_lock ();
         {
+            // COMM
+            junk_id3v2_remove_frames (&id3v2, "COMM");
             const char *val = pl_find_meta (it, "comment");
             if (val && *val) {
-                junk_id3v2_remove_frames (&id3v2, "COMM");
                 junk_id3v2_add_comment_frame (&id3v2, "eng", "", val);
             }
+            // UFID
+            junk_id3v2_remove_ufid_frames (&id3v2, "UFID", "http://musicbrainz.org");
+            val = pl_find_meta (it, "musicbrainz_trackid");
+            if (val && *val) {
+                junk_id3v2_add_ufid_frame (&id3v2, "http://musicbrainz.org", val, strlen (val));
+            }
         }
         pl_unlock ();
 
@@ -3759,7 +4268,7 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
         pl_unlock ();
 
         // write tag
-        if (junk_id3v2_write (out, &id3v2) != 0) {
+        if (junk_id3v2_write2 (out, &id3v2) != 0) {
             trace ("cmp3_write_metadata: failed to write id3v2 tag to %s\n", pl_find_meta (it, ":URI"))
             goto error;
         }
@@ -3768,7 +4277,7 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
     // now write audio data
     buffer = malloc (8192);
     deadbeef->fseek (fp, header, SEEK_SET);
-    int writesize = fsize;
+    int64_t writesize = fsize;
     if (footer > 0) {
         writesize -= (fsize - footer);
     }
@@ -3782,7 +4291,7 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
             fprintf (stderr, "junk_write_id3v2: error reading input data\n");
             goto error;
         }
-        if (fwrite (buffer, 1, rb, out) != rb) {
+        if (write (out, buffer, rb) != rb) {
             fprintf (stderr, "junk_write_id3v2: error writing output file\n");
             goto error;
         }
@@ -3808,7 +4317,7 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
             free (buf);
             goto error;
         }
-        if (fwrite (buf, 1, apev2_size, out) != apev2_size) {
+        if (write (out, buf, apev2_size) != apev2_size) {
             trace ("cmp3_write_metadata: failed to copy original apev2 tag from %s to temp file\n", pl_find_meta (it, ":URI"));
             free (buf);
             goto error;
@@ -3867,7 +4376,7 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
         pl_unlock ();
 
         // write tag
-        if (deadbeef->junk_apev2_write (out, &apev2, 0, 1) != 0) {
+        if (junk_apev2_write2 (out, &apev2, 0, 1) != 0) {
             trace ("cmp3_write_metadata: failed to write apev2 tag to %s\n", pl_find_meta (it, ":URI"))
             goto error;
         }
@@ -3884,14 +4393,14 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
             trace ("cmp3_write_metadata: failed to read original id3v1 tag from %s\n", pl_find_meta (it, ":URI"));
             goto error;
         }
-        if (fwrite (buf, 1, 128, out) != 128) {
+        if (write (out, buf, 128) != 128) {
             trace ("cmp3_write_metadata: failed to copy id3v1 tag from %s to temp file\n", pl_find_meta (it, ":URI"));
             goto error;
         }
     }
     else if (write_id3v1) {
         trace ("writing new id3v1 tag\n");
-        if (junk_id3v1_write (out, it, id3v1_encoding) != 0) {
+        if (junk_id3v1_write2 (out, it, id3v1_encoding) != 0) {
             trace ("cmp3_write_metadata: failed to write id3v1 tag to %s\n", pl_find_meta (it, ":URI"))
             goto error;
         }
@@ -3925,7 +4434,8 @@ error:
         deadbeef->fclose (fp);
     }
     if (out) {
-        fclose (out);
+        close (out);
+        out = -1;
     }
     if (buffer) {
         free (buffer);
@@ -3952,9 +4462,16 @@ junk_enable_cp936_detection (int enable) {
 }
 
 void
+junk_enable_shift_jis_detection (int enable) {
+    enable_shift_jis_detection = enable;
+}
+
+void
 junk_configchanged (void) {
     int cp1251 = conf_get_int ("junk.enable_cp1251_detection", 1);
     int cp936 = conf_get_int ("junk.enable_cp936_detection", 0);
+    int shift_jis = conf_get_int ("junk.enable_shift_jis_detection", 0);
     junk_enable_cp1251_detection (cp1251);
     junk_enable_cp936_detection (cp936);
+    junk_enable_shift_jis_detection (shift_jis);
 }
diff --git a/junklib.h b/junklib.h
index aaec1a5..6e68994 100644
--- a/junklib.h
+++ b/junklib.h
@@ -125,4 +125,7 @@ junk_configchanged (void);
 void
 junk_enable_cp936_detection (int enable);
 
+const char *
+junk_detect_charset_len (const char *s, int len);
+
 #endif // __JUNKLIB_H
diff --git a/ltmain.sh b/ltmain.sh
index b9205ee..a356aca 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -70,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -80,7 +80,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.2ubuntu1"
+VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
 TIMESTAMP=""
 package_revision=1.3337
 
diff --git a/main.c b/main.c
index d5a7b83..5546e5a 100644
--- a/main.c
+++ b/main.c
@@ -86,6 +86,7 @@ char use_gui_plugin[100];
 
 static void
 print_help (void) {
+	bind_textdomain_codeset (PACKAGE, "");
     fprintf (stdout, _("Usage: deadbeef [options] [--] [file(s)]\n"));
     fprintf (stdout, _("Options:\n"));
     fprintf (stdout, _("   --help  or  -h     Print help (this message) and exit\n"));
@@ -106,7 +107,8 @@ print_help (void) {
                 "                      [l]ength, track[n]umber, [y]ear, [c]omment,\n"
                 "                      copy[r]ight, [e]lapsed\n"));
     fprintf (stdout, _("                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"));
-    fprintf (stdout, _("                      for more info, see http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"));
+    fprintf (stdout, _("                      for more info, see %s\n"), "http://github.com/Alexey-Yakovenko/deadbeef/wiki/Title-formatting");
+	bind_textdomain_codeset (PACKAGE, "UTF-8");
 }
 
 // Parse command line an return a single buffer with all
@@ -276,6 +278,17 @@ server_exec_command_line (const char *cmdline, int len, char *sendback, int sbsi
             }
             continue;
         }
+        else if (!strcmp (parg, "--gui")) {
+            // need to skip --gui here, it is handled in the client cmdline
+            parg += strlen (parg);
+            parg++;
+            if (parg >= pend) {
+                break;
+            }
+            parg += strlen (parg);
+            parg++;
+            continue;
+        }
         else if (parg[0] != '-') {
             break; // unknown option is filename
         }
@@ -283,12 +296,6 @@ server_exec_command_line (const char *cmdline, int len, char *sendback, int sbsi
         parg++;
     }
     if (parg < pend) {
-        playlist_t *curr_plt = plt_get_curr ();
-        if (plt_add_files_begin (curr_plt, 0) != 0) {
-            plt_unref (curr_plt);
-            snprintf (sendback, sbsize, "it's not allowed to add files to playlist right now, because another file adding operation is in progress. please try again later.");
-            return 0;
-        }
         if (conf_get_int ("cli_add_to_specific_playlist", 1)) {
             char str[200];
             conf_get_str ("cli_add_playlist_name", "Default", str, sizeof (str));
@@ -300,6 +307,12 @@ server_exec_command_line (const char *cmdline, int len, char *sendback, int sbsi
                 plt_set_curr_idx (idx);
             }
         }
+        playlist_t *curr_plt = plt_get_curr ();
+        if (plt_add_files_begin (curr_plt, 0) != 0) {
+            plt_unref (curr_plt);
+            snprintf (sendback, sbsize, "it's not allowed to add files to playlist right now, because another file adding operation is in progress. please try again later.");
+            return 0;
+        }
         // add files
         if (!queue) {
             plt_clear (curr_plt);
@@ -319,10 +332,7 @@ server_exec_command_line (const char *cmdline, int len, char *sendback, int sbsi
                 if (deadbeef->plt_add_file2 (0, (ddb_playlist_t*)curr_plt, pname, NULL, NULL) < 0) {
                     int ab = 0;
                     playItem_t *it = plt_load2 (0, curr_plt, NULL, pname, &ab, NULL, NULL);
-                    if (it) {
-                        pl_item_unref (it);
-                    }
-                    else {
+                    if (!it) {
                         fprintf (stderr, "failed to add file or folder %s\n", pname);
                     }
                 }
@@ -334,7 +344,7 @@ server_exec_command_line (const char *cmdline, int len, char *sendback, int sbsi
         plt_add_files_end (curr_plt, 0);
         plt_unref (curr_plt);
         if (!queue) {
-            messagepump_push (DB_EV_PLAY_CURRENT, 0, 1, 0);
+            messagepump_push (DB_EV_PLAY_NUM, 0, 0, 0);
             return 2; // don't reload playlist at startup
         }
     }
@@ -561,36 +571,20 @@ player_mainloop (void) {
                     }
                     break;
                 case DB_EV_PLAY_CURRENT:
-                    if (p1) {
-                        output->stop ();
-                        pl_playqueue_clear ();
-                        streamer_set_nextsong (0, 1);
-                    }
-                    else {
-                        streamer_play_current_track ();
-                    }
+                    streamer_play_current_track ();
                     break;
                 case DB_EV_PLAY_NUM:
-                    output->stop ();
                     pl_playqueue_clear ();
-                    streamer_set_nextsong (p1, 1);
-                    if (pl_get_order () == PLAYBACK_ORDER_SHUFFLE_ALBUMS) {
-                        int pl = streamer_get_current_playlist ();
-                        playlist_t *plt = plt_get_for_idx (pl);
-                        plt_init_shuffle_albums (plt, p1);
-                        plt_unref (plt);
-                    }
+                    streamer_set_nextsong (p1, 4);
                     break;
                 case DB_EV_STOP:
                     streamer_set_nextsong (-2, 0);
                     break;
                 case DB_EV_NEXT:
-                    output->stop ();
                     streamer_move_to_nextsong (1);
                     break;
                 case DB_EV_PREV:
-                    output->stop ();
-                    streamer_move_to_prevsong ();
+                    streamer_move_to_prevsong (1);
                     break;
                 case DB_EV_PAUSE:
                     if (output->state () != OUTPUT_STATE_PAUSED) {
@@ -600,8 +594,7 @@ player_mainloop (void) {
                     break;
                 case DB_EV_TOGGLE_PAUSE:
                     if (output->state () == OUTPUT_STATE_PAUSED) {
-                        output->unpause ();
-                        messagepump_push (DB_EV_PAUSED, 0, 0, 0);
+                        streamer_play_current_track ();
                     }
                     else {
                         output->pause ();
@@ -609,8 +602,7 @@ player_mainloop (void) {
                     }
                     break;
                 case DB_EV_PLAY_RANDOM:
-                    output->stop ();
-                    streamer_move_to_randomsong ();
+                    streamer_move_to_randomsong (1);
                     break;
                 case DB_EV_PLAYLIST_REFRESH:
                     pl_save_current ();
@@ -682,13 +674,6 @@ restore_resume_state (void) {
             streamer_lock (); // need to hold streamer thread to make the resume operation atomic
             streamer_set_current_playlist (plt);
             streamer_set_nextsong (track, paused ? 2 : 3);
-            if (pl_get_order () == PLAYBACK_ORDER_SHUFFLE_ALBUMS) {
-                playlist_t *p = plt_get_for_idx (plt);
-                if (p) {
-                    plt_init_shuffle_albums (p, track);
-                    plt_unref (p);
-                }
-            }
             streamer_set_seek (pos);
             streamer_unlock ();
         }
@@ -860,10 +845,14 @@ main (int argc, char *argv[]) {
             return 0;
         }
         else if (!strcmp (argv[i], "--version")) {
-            fprintf (stdout, "DeaDBeeF " VERSION " Copyright © 2009-2013 Alexey Yakovenko\n");
+            fprintf (stderr, "DeaDBeeF " VERSION " Copyright © 2009-2013 Alexey Yakovenko\n");
             return 0;
         }
         else if (!strcmp (argv[i], "--gui")) {
+            if (i == argc-1) {
+                break;
+            }
+            i++;
             strncpy (use_gui_plugin, argv[i], sizeof(use_gui_plugin) - 1);
             use_gui_plugin[sizeof(use_gui_plugin) - 1] = 0;
         }
diff --git a/pixmaps/Makefile.in b/pixmaps/Makefile.in
index 8d444e1..255a66f 100644
--- a/pixmaps/Makefile.in
+++ b/pixmaps/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = pixmaps
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -80,6 +107,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -116,6 +155,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(pixmapsdir)"
 DATA = $(pixmaps_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -140,6 +180,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -160,10 +201,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -186,6 +229,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -239,6 +283,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -257,6 +302,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -282,13 +329,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -297,7 +348,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -423,11 +476,11 @@ uninstall-pixmapsDATA:
 	@list='$(pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(pixmapsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -566,16 +619,16 @@ uninstall-am: uninstall-pixmapsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-pixmapsDATA install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-pixmapsDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pixmapsDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-pixmapsDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/playlist.c b/playlist.c
index 3cf80da..4132fd9 100644
--- a/playlist.c
+++ b/playlist.c
@@ -61,6 +61,11 @@
 #include "metacache.h"
 #include "volume.h"
 #include "pltmeta.h"
+#include "escape.h"
+#include "strdupa.h"
+
+// disable custom title function, until we have new title formatting (0.7)
+#define DISABLE_CUSTOM_TITLE
 
 #define DISABLE_LOCKING 0
 #define DEBUG_LOCKING 0
@@ -103,7 +108,6 @@ static int plt_loading = 0; // disable sending event about playlist switch, conf
 
 #if !DISABLE_LOCKING
 static uintptr_t mutex;
-static uintptr_t mutex_plt;
 #endif
 
 #define LOCK {pl_lock();}
@@ -163,7 +167,6 @@ pl_init (void) {
     playlist = &dummy_playlist;
 #if !DISABLE_LOCKING
     mutex = mutex_create ();
-    mutex_plt = mutex_create ();
 #endif
     return 0;
 }
@@ -193,10 +196,6 @@ pl_free (void) {
         mutex_free (mutex);
         mutex = 0;
     }
-    if (mutex_plt) {
-        mutex_free (mutex_plt);
-        mutex_plt = 0;
-    }
 #endif
     playlist = NULL;
 }
@@ -263,8 +262,12 @@ plt_gen_conf (void) {
     playlist_t *p = playlists_head;
     for (i = 0; i < cnt; i++, p = p->next) {
         char s[100];
-        snprintf (s, sizeof (s), "playlist.tab.%02d", i);
+        snprintf (s, sizeof (s), "playlist.tab.%05d", i);
         conf_set_str (s, p->title);
+        snprintf (s, sizeof (s), "playlist.cursor.%d", i);
+        conf_set_int (s, p->current_row[PL_MAIN]);
+        snprintf (s, sizeof (s), "playlist.scroll.%d", i);
+        conf_set_int (s, p->scroll);
     }
     UNLOCK;
 }
@@ -373,10 +376,6 @@ int
 plt_add (int before, const char *title) {
     assert (before >= 0);
     trace ("plt_add\n");
-    if (plt_get_count () >= 100) {
-        fprintf (stderr, "can't create more than 100 playlists. sorry.\n");
-        return -1;
-    }
     playlist_t *plt = plt_alloc (title);
     plt_modified (plt);
 
@@ -840,7 +839,7 @@ pl_cue_skipspaces (const uint8_t *p) {
 }
 
 static void
-pl_get_qvalue_from_cue (const uint8_t *p, int sz, char *out) {
+pl_get_qvalue_from_cue (const uint8_t *p, int sz, char *out, const char *charset) {
     char *str = out;
     if (*p == 0) {
         *out = 0;
@@ -873,15 +872,22 @@ pl_get_qvalue_from_cue (const uint8_t *p, int sz, char *out) {
         out++;
         *out = 0;
     }
-    const char *charset = junk_detect_charset (str);
+
     if (!charset) {
         return;
     }
+
     // recode
     int l = strlen (str);
-    char in[l+1];
-    memcpy (in, str, l+1);
-    junk_recode (in, l, str, sz, charset);
+    char recbuf[l*10];
+    int res = junk_recode (str, l, recbuf, sizeof (recbuf)-1, charset);
+    if (res > 0) {
+        strcpy (str, recbuf);
+    }
+    else
+    {
+        strcpy (str, "<UNRECOGNIZED CHARSET>");
+    }
 }
 
 static void
@@ -917,7 +923,7 @@ pl_cue_parse_time (const char *p) {
 }
 
 static playItem_t *
-plt_process_cue_track (playlist_t *playlist, const char *fname, playItem_t **prev, char *track, char *index00, char *index01, char *pregap, char *title, char *albumperformer, char *performer, char *albumtitle, char *genre, char *date, char *replaygain_album_gain, char *replaygain_album_peak, char *replaygain_track_gain, char *replaygain_track_peak, const char *decoder_id, const char *ftype, int samplerate) {
+plt_process_cue_track (playlist_t *playlist, const char *fname, const int startsample, playItem_t **prev, char *track, char *index00, char *index01, char *pregap, char *title, char *albumperformer, char *performer, char *albumtitle, char *genre, char *date, char *replaygain_album_gain, char *replaygain_album_peak, char *replaygain_track_gain, char *replaygain_track_peak, const char *decoder_id, const char *ftype, int samplerate) {
     if (!track[0]) {
         trace ("pl_process_cue_track: invalid track (file=%s, title=%s)\n", fname, title);
         return NULL;
@@ -960,14 +966,14 @@ plt_process_cue_track (playlist_t *playlist, const char *fname, playItem_t **pre
             trace ("pl_process_cue_track: invalid pregap or index01 (pregap=%s, index01=%s)\n", pregap, index01);
             return NULL;
         }
-        (*prev)->endsample = (prevtime * samplerate) - 1;
+        (*prev)->endsample = startsample + (prevtime * samplerate) - 1;
         plt_set_item_duration (playlist, *prev, (float)((*prev)->endsample - (*prev)->startsample + 1) / samplerate);
         if (pl_get_item_duration (*prev) < 0) {
             // might be bad cuesheet file, try to fix
             trace ("cuesheet seems to be corrupted, trying workaround\n");
             //trace ("[bad:] calc endsample=%d, prevtime=%f, samplerate=%d, prev track duration=%f\n", (*prev)->endsample,  prevtime, samplerate, (*prev)->duration);
             prevtime = f_index01;
-            (*prev)->endsample = (prevtime * samplerate) - 1;
+            (*prev)->endsample = startsample + (prevtime * samplerate) - 1;
             float dur = (float)((*prev)->endsample - (*prev)->startsample + 1) / samplerate;
             plt_set_item_duration (playlist, *prev, dur);
             if (dur > 0) {
@@ -987,7 +993,7 @@ plt_process_cue_track (playlist_t *playlist, const char *fname, playItem_t **pre
     }
     playItem_t *it = pl_item_alloc_init (fname, decoder_id);
     pl_set_meta_int (it, ":TRACKNUM", atoi (track));
-    it->startsample = index01[0] ? f_index01 * samplerate : 0;
+    it->startsample = index01[0] ? startsample + f_index01 * samplerate : startsample;
     it->endsample = -1; // will be filled by next read, or by decoder
     pl_replace_meta (it, ":FILETYPE", ftype);
     if (performer[0]) {
@@ -1033,11 +1039,33 @@ plt_process_cue_track (playlist_t *playlist, const char *fname, playItem_t **pre
 
 playItem_t *
 plt_insert_cue_from_buffer (playlist_t *playlist, playItem_t *after, playItem_t *origin, const uint8_t *buffer, int buffersize, int numsamples, int samplerate) {
-    LOCK;
     if (buffersize >= 3 && buffer[0] == 0xef && buffer[1] == 0xbb && buffer[2] == 0xbf) {
         buffer += 3;
         buffersize -= 3;
     }
+
+    // go through the file, and verify that it's not for multiple tracks
+    int fcount = 0;
+    uint8_t *p = (uint8_t *)buffer;
+    uint8_t *e = (uint8_t *)(buffer + buffersize);
+    while (*p) {
+        while (*p <= 0x20 && *p) {
+            p++;
+        }
+        if (e-p > 4 && !memcmp ((char *)p, "FILE", 4) && p[4] == 0x20) {
+            fcount++;
+            if (fcount > 1) {
+                return NULL;
+            }
+        }
+        while (*p >= 0x20 && *p) {
+            p++;
+        }
+    }
+
+    const char *charset = junk_detect_charset_len (buffer, buffersize);
+
+    LOCK;
     playItem_t *ins = after;
     trace ("plt_insert_cue_from_buffer numsamples=%d, samplerate=%d\n", numsamples, samplerate);
     char albumperformer[256] = "";
@@ -1086,25 +1114,25 @@ plt_insert_cue_from_buffer (playlist_t *playlist, playItem_t *after, playItem_t
 //        trace ("cue line: %s\n", p);
         if (!strncmp (p, "PERFORMER ", 10)) {
             if (!track[0]) {
-                pl_get_qvalue_from_cue (p + 10, sizeof (albumperformer), albumperformer);
+                pl_get_qvalue_from_cue (p + 10, sizeof (albumperformer), albumperformer, charset);
             }
             else {
-                pl_get_qvalue_from_cue (p + 10, sizeof (performer), performer);
+                pl_get_qvalue_from_cue (p + 10, sizeof (performer), performer, charset);
             }
             trace ("cue: got performer: %s\n", performer);
         }
         else if (!strncmp (p, "TITLE ", 6)) {
             if (str[0] > ' ' && !albumtitle[0]) {
-                pl_get_qvalue_from_cue (p + 6, sizeof (albumtitle), albumtitle);
+                pl_get_qvalue_from_cue (p + 6, sizeof (albumtitle), albumtitle, charset);
                 trace ("cue: got albumtitle: %s\n", albumtitle);
             }
             else {
-                pl_get_qvalue_from_cue (p + 6, sizeof (title), title);
+                pl_get_qvalue_from_cue (p + 6, sizeof (title), title, charset);
                 trace ("cue: got title: %s\n", title);
             }
         }
         else if (!strncmp (p, "REM GENRE ", 10)) {
-            pl_get_qvalue_from_cue (p + 10, sizeof (genre), genre);
+            pl_get_qvalue_from_cue (p + 10, sizeof (genre), genre, charset);
         }
         else if (!strncmp (p, "REM DATE ", 9)) {
             pl_get_value_from_cue (p + 9, sizeof (date), date);
@@ -1113,10 +1141,10 @@ plt_insert_cue_from_buffer (playlist_t *playlist, playItem_t *after, playItem_t
             trace ("cue: adding track: %s %s %s\n", uri, title, track);
             if (title[0]) {
                 // add previous track
-                playItem_t *it = plt_process_cue_track (playlist, uri, &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, dec, filetype, samplerate);
+                playItem_t *it = plt_process_cue_track (playlist, uri, origin->startsample, &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, dec, filetype, samplerate);
                 trace ("cue: added %p\n", it);
                 if (it) {
-                    if (it->startsample >= numsamples || it->endsample >= numsamples) {
+                    if ((it->startsample-origin->startsample) >= numsamples || (it->endsample-origin->startsample) >= numsamples) {
                         trace ("cue: the track is shorter than cue timeline\n");
                         goto error;
                     }
@@ -1162,11 +1190,11 @@ plt_insert_cue_from_buffer (playlist_t *playlist, playItem_t *after, playItem_t
     }
     if (title[0]) {
         // handle last track
-        playItem_t *it = plt_process_cue_track (playlist, uri, &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, dec, filetype, samplerate);
+        playItem_t *it = plt_process_cue_track (playlist, uri, origin->startsample, &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, dec, filetype, samplerate);
         if (it) {
-            trace ("last track endsample: %d\n", numsamples-1);
-            it->endsample = numsamples-1;
-            if (it->endsample >= numsamples || it->startsample >= numsamples) {
+            trace ("last track endsample: %d\n", origin->startsample+numsamples-1);
+            it->endsample = origin->startsample + numsamples - 1;
+            if ((it->endsample-origin->startsample) >= numsamples || (it->startsample-origin->startsample) >= numsamples) {
                 goto error;
             }
             plt_set_item_duration (playlist, it, (float)(it->endsample - it->startsample + 1) / samplerate);
@@ -1222,16 +1250,27 @@ plt_insert_cue (playlist_t *plt, playItem_t *after, playItem_t *origin, int nums
     strcpy (cuename+len, ".cue");
     DB_FILE *fp = vfs_fopen (cuename);
     if (!fp) {
+        strcpy (cuename+len, ".CUE");
+        fp = vfs_fopen (cuename);
+    }
+    if (!fp) {
         char *ptr = cuename + len-1;
         while (ptr >= cuename && *ptr != '.') {
             ptr--;
         }
+        if (ptr < cuename) {
+            return NULL;
+        }
         strcpy (ptr+1, "cue");
         fp = vfs_fopen (cuename);
         if (!fp) {
-            return NULL;
+            strcpy (ptr+1, "CUE");
+            fp = vfs_fopen (cuename);
         }
     }
+    if (!fp) {
+        return NULL;
+    }
     size_t sz = vfs_fgetlength (fp);
     if (sz == 0) {
         vfs_fclose (fp);
@@ -1272,7 +1311,6 @@ plt_insert_file_int (int visibility, playlist_t *playlist, playItem_t *after, co
         DB_vfs_t **vfsplugs = plug_get_vfs_list ();
         for (int i = 0; vfsplugs[i]; i++) {
             if (vfsplugs[i]->is_container) {
-                trace ("%s cont test\n", fname);
                 if (vfsplugs[i]->is_container (fname)) {
                     trace ("inserting %s via vfs %s\n", fname, vfsplugs[i]->plugin.id);
                     playItem_t *it = plt_insert_dir_int (visibility, playlist, vfsplugs[i], after, fname, pabort, cb, user_data);
@@ -1352,6 +1390,11 @@ plt_insert_file_int (int visibility, playlist_t *playlist, playItem_t *after, co
         }
     }
     else {
+        char *escaped = uri_unescape (fname, strlen (fname));
+        if (escaped) {
+            fname = strdupa (escaped);
+            free (escaped);
+        }
         fname += 7;
     }
 
@@ -1477,11 +1520,25 @@ plt_insert_dir_int (int visibility, playlist_t *playlist, DB_vfs_t *vfs, playIte
                     }
                 }
                 else {
-                    inserted = plt_insert_file_int (visibility, playlist, after, namelist[i]->d_name, pabort, cb, user_data);
-                    if (!inserted) {
-                        // special case for loading playlists in zip files
-                        inserted = plt_load_int (visibility, playlist, after, namelist[i]->d_name, pabort, cb, user_data);
+                    char fullname[PATH_MAX];
+                    const char *sch = NULL;
+                    if (vfs->plugin.api_vminor >= 6 && vfs->get_scheme_for_name) {
+                        sch = vfs->get_scheme_for_name (dirname);
+                    }
+                    if (sch && strncmp (sch, namelist[i]->d_name, strlen (sch))) {
+                        snprintf (fullname, sizeof (fullname), "%s%s:%s", sch, dirname, namelist[i]->d_name);
                     }
+                    else {
+                        strcpy (fullname, namelist[i]->d_name);
+                    }
+                    inserted = plt_insert_file_int (visibility, playlist, after, fullname, pabort, cb, user_data);
+                    // NOTE: adding archive to playlist is the same as adding a
+                    // folder, so we don't load any playlists.
+                    // the code below is kept for reference
+//                    if (!inserted) {
+//                        // special case for loading playlists in zip files
+//                        inserted = plt_load_int (visibility, playlist, after, fullname, pabort, cb, user_data);
+//                    }
                 }
                 if (inserted) {
                     after = inserted;
@@ -1908,6 +1965,7 @@ pl_crop_selected (void) {
 int
 plt_save (playlist_t *plt, playItem_t *first, playItem_t *last, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) {
     LOCK;
+    plt->last_save_modification_idx = plt->last_save_modification_idx;
     const char *ext = strrchr (fname, '.');
     if (ext) {
         DB_playlist_t **plug = deadbeef->plug_get_playlist_list ();
@@ -2166,6 +2224,7 @@ pl_save_all (void) {
     int curr = plt_get_curr_idx ();
     int err = 0;
 
+    plt_gen_conf ();
     plt_loading = 1;
     for (i = 0; i < cnt; i++, p = p->next) {
         if (snprintf (path, sizeof (path), "%s/playlists/%d.dbpl", dbconfdir, i) > sizeof (path)) {
@@ -2173,6 +2232,9 @@ pl_save_all (void) {
             err = -1;
             break;
         }
+        if (p->last_save_modification_idx == p->modification_idx) {
+            continue;
+        }
         err = plt_save (p, NULL, NULL, path, NULL, NULL, NULL);
         if (err < 0) {
             break;
@@ -2457,6 +2519,9 @@ plt_load_int (int visibility, playlist_t *plt, playItem_t *after, const char *fn
         fclose (fp);
     }
     trace ("plt_load: success\n");
+    if (last_added) {
+        pl_item_unref (last_added);
+    }
     return last_added;
 load_fail:
     plt_clear (plt);
@@ -2464,6 +2529,9 @@ load_fail:
     if (fp) {
         fclose (fp);
     }
+    if (last_added) {
+        pl_item_unref (last_added);
+    }
     return last_added;
 }
 
@@ -2492,9 +2560,6 @@ pl_load_all (void) {
 
         playlist_t *plt = plt_get_for_idx (0);
         playItem_t *it = plt_load (plt, NULL, defpl, NULL, NULL, NULL);
-        if (it) {
-            pl_item_unref (it);
-        }
         plt_unref (plt);
         return 0;
     }
@@ -2520,9 +2585,12 @@ pl_load_all (void) {
 
             playlist_t *plt = plt_get_curr ();
             playItem_t *trk = plt_load (plt, NULL, path, NULL, NULL, NULL);
-            if (trk) {
-                pl_item_unref (trk);
-            }
+            char conf[100];
+            snprintf (conf, sizeof (conf), "playlist.cursor.%d", i);
+            plt->current_row[PL_MAIN] = deadbeef->conf_get_int (conf, -1);
+            snprintf (conf, sizeof (conf), "playlist.scroll.%d", i);
+            plt->scroll = deadbeef->conf_get_int (conf, 0);
+            plt->last_save_modification_idx = plt->modification_idx = 0;
             plt_unref (plt);
 
             if (!it) {
@@ -2878,9 +2946,30 @@ pl_format_title_int (const char *escape_chars, playItem_t *it, int idx, char *s,
             }
             else if (*fmt == 'a') {
                 meta = pl_find_meta_raw (it, "artist");
-                if (!meta) {
+#ifndef DISABLE_CUSTOM_TITLE
+                const char *custom = pl_find_meta_raw (it, ":CUSTOM_TITLE");
+#endif
+                if (!meta
+#ifndef DISABLE_CUSTOM_TITLE
+                && !custom
+#endif
+                ) {
                     meta = "Unknown artist";
                 }
+
+#ifndef DISABLE_CUSTOM_TITLE
+                if (custom) {
+                    if (!meta) {
+                        meta = custom;
+                    }
+                    else {
+                        int l = strlen (custom) + strlen (meta) + 4;
+                        char *out = alloca (l);
+                        snprintf (out, l, "[%s] %s", custom, meta);
+                        meta = out;
+                    }
+                }
+#endif
             }
             else if (*fmt == 't') {
                 meta = pl_find_meta_raw (it, "title");
@@ -2928,6 +3017,21 @@ pl_format_title_int (const char *escape_chars, playItem_t *it, int idx, char *s,
                         }
                     }
                 }
+
+#ifndef DISABLE_CUSTOM_TITLE
+                const char *custom = pl_find_meta_raw (it, ":CUSTOM_TITLE");
+                if (custom) {
+                    if (!meta) {
+                        meta = custom;
+                    }
+                    else {
+                        int l = strlen (custom) + strlen (meta) + 4;
+                        char *out = alloca (l);
+                        snprintf (out, l, "[%s] %s", custom, meta);
+                        meta = out;
+                    }
+                }
+#endif
             }
             else if (*fmt == 'C') {
                 meta = pl_find_meta_raw (it, "composer");
@@ -3690,7 +3794,7 @@ plt_search_process (playlist_t *playlist, const char *text) {
                             break;
                         }
                     }
-                    else if (utfcasestr_fast (value, lc)) {
+                    else if (u8_valid(value, strlen(value), NULL) && u8_valid(lc, strlen(lc), NULL) && utfcasestr_fast (value, lc)) {
                         //fprintf (stderr, "%s -> %s match (%s.%s)\n", text, value, pl_find_meta_raw (it, ":URI"), m->key);
                         // add to list
                         it->next[PL_SEARCH] = NULL;
@@ -3846,7 +3950,7 @@ pl_items_copy_junk (playItem_t *from, playItem_t *first, playItem_t *last) {
     DB_metaInfo_t *meta = from->meta;
     while (meta) {
         playItem_t *i;
-        for (i = first; ; i = i->next[PL_MAIN]) {
+        for (i = first; i; i = i->next[PL_MAIN]) {
             i->_flags = from->_flags;
             pl_add_meta (i, meta->key, meta->value);
             if (i == last) {
@@ -4103,6 +4207,7 @@ plt_add_files_begin (playlist_t *plt, int visibility) {
     for (ddb_fileadd_beginend_listener_t *l = file_add_beginend_listeners; l; l = l->next) {
         l->callback_begin (&d, l->user_data);
     }
+    background_job_increment ();
     return 0;
 }
 
@@ -4123,6 +4228,7 @@ plt_add_files_end (playlist_t *plt, int visibility) {
     for (ddb_fileadd_beginend_listener_t *l = file_add_beginend_listeners; l; l = l->next) {
         l->callback_end (&d, l->user_data);
     }
+    background_job_decrement ();
 }
 
 void
@@ -4133,3 +4239,14 @@ plt_deselect_all (playlist_t *playlist) {
     }
     UNLOCK;
 }
+
+void
+plt_set_scroll (playlist_t *plt, int scroll) {
+    plt->scroll = scroll;
+}
+
+int
+plt_get_scroll (playlist_t *plt) {
+    return plt->scroll;
+}
+
diff --git a/playlist.h b/playlist.h
index b8bdeb4..44149ab 100644
--- a/playlist.h
+++ b/playlist.h
@@ -62,9 +62,11 @@ typedef struct playlist_s {
     int count[2];
     float totaltime;
     int modification_idx;
+    int last_save_modification_idx;
     playItem_t *head[PL_MAX_ITERATORS]; // head of linked list
     playItem_t *tail[PL_MAX_ITERATORS]; // tail of linked list
     int current_row[PL_MAX_ITERATORS]; // current row (cursor)
+    int scroll;
     struct DB_metaInfo_s *meta; // linked list storing metainfo
     int refc;
     int files_add_visibility;
@@ -524,4 +526,10 @@ plt_add_files_end (playlist_t *plt, int visibility);
 void
 plt_deselect_all (playlist_t *plt);
 
+void
+plt_set_scroll (playlist_t *plt, int scroll);
+
+int
+plt_get_scroll (playlist_t *plt);
+
 #endif // __PLAYLIST_H
diff --git a/plmeta.c b/plmeta.c
index e93e280..71ec237 100644
--- a/plmeta.c
+++ b/plmeta.c
@@ -52,7 +52,7 @@ pl_add_meta (playItem_t *it, const char *key, const char *value) {
             return;
         }
         // find end of normal metadata
-        if (!normaltail && (m->key[0] == ':' || m->key[0] == '_' || m->key[0] == '!')) {
+        if (!normaltail && (!m->next || m->key[0] == ':' || m->key[0] == '_' || m->key[0] == '!')) {
             normaltail = tail;
             propstart = m;
             if (key[0] != ':' && key[0] != '_' && key[0] != '!') {
diff --git a/plugins.c b/plugins.c
index 0d9872e..bf8192c 100644
--- a/plugins.c
+++ b/plugins.c
@@ -365,6 +365,9 @@ static DB_functions_t deadbeef_api = {
     .plt_add_files_begin = (int (*) (ddb_playlist_t *plt, int visibility))plt_add_files_begin,
     .plt_add_files_end = (void (*) (ddb_playlist_t *plt, int visibility))plt_add_files_end,
     .plt_deselect_all = (void (*) (ddb_playlist_t *plt))plt_deselect_all,
+    // ******* new 1.6 APIs ********
+    .plt_set_scroll = (void (*) (ddb_playlist_t *plt, int scroll))plt_set_scroll,
+    .plt_get_scroll = (int (*) (ddb_playlist_t *plt))plt_get_scroll,
 };
 
 DB_functions_t *deadbeef = &deadbeef_api;
@@ -504,9 +507,11 @@ plug_init_plugin (DB_plugin_t* (*loadfunc)(DB_functions_t *), void *handle) {
     // check if same plugin with the same or bigger version is loaded already
     plugin_t *prev = NULL;
     for (plugin_t *p = plugins; p; prev = p, p = p->next) {
-        if (p->plugin->id && plugin_api->id && !strcmp (p->plugin->id, plugin_api->id)) {
+        int same_id = p->plugin->id && plugin_api->id && !strcmp (p->plugin->id, plugin_api->id);
+        int same_name = (!p->plugin->id || !plugin_api->id) && p->plugin->name && plugin_api->name && !strcmp (p->plugin->name, plugin_api->name);
+        if (same_id || same_name) {
             if (plugin_api->version_major > p->plugin->version_major || (plugin_api->version_major == p->plugin->version_major && plugin_api->version_minor > p->plugin->version_minor)) {
-                trace ("found newer version of plugin \"%s\", replacing\n", plugin_api->id);
+                trace ("found newer version of plugin \"%s\" (%s), replacing\n", plugin_api->id, plugin_api->name);
                 // unload older plugin before replacing
                 dlclose (p->handle);
                 if (prev) {
@@ -521,7 +526,7 @@ plug_init_plugin (DB_plugin_t* (*loadfunc)(DB_functions_t *), void *handle) {
                 free (p);
             }
             else {
-                trace ("found copy of plugin \"%s\", but newer version is already loaded\n", plugin_api->id)
+                trace ("found copy of plugin \"%s\" (%s), but newer version is already loaded\n", plugin_api->id, plugin_api->name)
                 return -1;
             }
         }
@@ -693,12 +698,17 @@ load_gui_plugin (const char **plugdirs) {
     return -1;
 }
 
-int
-load_plugin_dir (const char *plugdir) {
+static int
+load_plugin_dir (const char *plugdir, int gui_scan) {
     int n = 0;
     char conf_blacklist_plugins[1000];
     conf_get_str ("blacklist_plugins", "", conf_blacklist_plugins, sizeof (conf_blacklist_plugins));
-    trace ("loading plugins from %s\n", plugdir);
+    if (gui_scan) {
+        trace ("searching for GUI plugins in %s\n", plugdir);
+    }
+    else {
+        trace ("loading plugins from %s\n", plugdir);
+    }
     struct dirent **namelist = NULL;
     n = scandir (plugdir, &namelist, NULL, dirent_alphasort);
     if (n < 0)
@@ -759,35 +769,39 @@ load_plugin_dir (const char *plugdir) {
 
                 // add gui plugin names
                 if (!strncmp (d_name, "ddb_gui_", 8)) {
-                    trace ("found gui plugin %s\n", d_name);
-                    if (g_num_gui_names >= MAX_GUI_PLUGINS) {
-                        fprintf (stderr, "too many gui plugins\n");
-                        break; // no more gui plugins allowed
-                    }
-                    char *nm = d_name + 8;
-                    char *e = strrchr (nm, '.');
-                    if (!e) {
-                        break;
-                    }
-                    if (strcmp (e, ".so")) {
-                        break;
-                    }
-                    *e = 0;
-                    // ignore fallbacks
-                    e = strrchr (nm, '.');
-                    if (e && !strcasecmp (e, ".fallback")) {
-                        break;
+                    if (gui_scan) {
+                        trace ("found gui plugin %s\n", d_name);
+                        if (g_num_gui_names >= MAX_GUI_PLUGINS) {
+                            fprintf (stderr, "too many gui plugins\n");
+                            break; // no more gui plugins allowed
+                        }
+                        char *nm = d_name + 8;
+                        char *e = strrchr (nm, '.');
+                        if (!e) {
+                            break;
+                        }
+                        if (strcmp (e, ".so")) {
+                            break;
+                        }
+                        *e = 0;
+                        // ignore fallbacks
+                        e = strrchr (nm, '.');
+                        if (e && !strcasecmp (e, ".fallback")) {
+                            break;
+                        }
+                        // add to list
+                        // FIXME check for gui plugins dupes
+                        g_gui_names[g_num_gui_names++] = strdup (nm);
+                        g_gui_names[g_num_gui_names] = NULL;
+                        trace ("added %s gui plugin\n", nm);
                     }
-                    // add to list
-                    // FIXME check for gui plugins dupes
-                    g_gui_names[g_num_gui_names++] = strdup (nm);
-                    g_gui_names[g_num_gui_names] = NULL;
-                    trace ("added %s gui plugin\n", nm);
                     break;
                 }
 
-                if (0 != load_plugin (plugdir, d_name, l)) {
-                    trace ("plugin not found or failed to load\n");
+                if (!gui_scan) {
+                    if (0 != load_plugin (plugdir, d_name, l)) {
+                        trace ("plugin not found or failed to load\n");
+                    }
                 }
                 break;
             }
@@ -811,6 +825,7 @@ plug_load_all (void) {
 #ifndef ANDROID
     char *xdg_local_home = getenv ("XDG_LOCAL_HOME");
     char xdg_plugin_dir[1024];
+    char xdg_plugin_dir_explicit_arch[1024];
 
     if (xdg_local_home) {
         strncpy (xdg_plugin_dir, xdg_local_home, sizeof (xdg_plugin_dir));
@@ -823,16 +838,24 @@ plug_load_all (void) {
             xdg_plugin_dir[0] = 0;
         }
         else {
+            // multilib support:
+            // 1. load from lib$ARCH if present
+            // 2. load from lib if present
             int written = snprintf (xdg_plugin_dir, sizeof (xdg_plugin_dir), "%s/.local/lib/deadbeef", homedir);
             if (written > sizeof (xdg_plugin_dir)) {
                 trace ("warning: XDG_LOCAL_HOME value is too long: %s. Ignoring.", xdg_local_home);
                 xdg_plugin_dir[0] = 0;
             }
+            written = snprintf (xdg_plugin_dir_explicit_arch, sizeof (xdg_plugin_dir_explicit_arch), "%s/.local/lib%d/deadbeef", homedir, (int)(sizeof (long) * 8));
+            if (written > sizeof (xdg_plugin_dir_explicit_arch)) {
+                trace ("warning: XDG_LOCAL_HOME value is too long: %s. Ignoring.", xdg_local_home);
+                xdg_plugin_dir_explicit_arch[0] = 0;
+            }
         }
     }
 
     // load from HOME 1st, than replace from installdir if needed
-    const char *plugins_dirs[] = { xdg_plugin_dir, dirname, NULL };
+    const char *plugins_dirs[] = { xdg_plugin_dir_explicit_arch, xdg_plugin_dir, dirname, NULL };
 
     // If xdg_plugin_dir and dirname is the same, we should avoid each plugin
     // to be load twice.
@@ -846,13 +869,26 @@ plug_load_all (void) {
 #endif
 
     int k = 0;
+#ifndef ANDROID
+    // load gui plugin before others
+    while (plugins_dirs[k]) {
+        const char *plugdir = plugins_dirs[k++];
+        if (!(*plugdir)) {
+            continue;
+        }
+        load_plugin_dir (plugdir, 1);
+    }
+    printf ("load gui plugin\n");
+    load_gui_plugin (plugins_dirs);
+#endif
 
+    k = 0;
     while (plugins_dirs[k]) {
         const char *plugdir = plugins_dirs[k++];
         if (!(*plugdir)) {
             continue;
         }
-        load_plugin_dir (plugdir);
+        load_plugin_dir (plugdir, 0);
     }
 
 #ifdef ANDROID
@@ -882,10 +918,6 @@ plug_load_all (void) {
     }
 #endif
 
-
-    // load gui plugin
-    load_gui_plugin (plugins_dirs);
-
 // load all compiled-in modules
 #define PLUG(n) extern DB_plugin_t * n##_load (DB_functions_t *api);
 #include "moduleconf.h"
diff --git a/plugins/aac/COPYING b/plugins/aac/COPYING
new file mode 100644
index 0000000..a23602c
--- /dev/null
+++ b/plugins/aac/COPYING
@@ -0,0 +1,25 @@
+AAC DeaDBeeF Player Plugin
+Copyright (c) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
+
+libmp4ff (modified)
+Code from MP4FF is copyright (c) Nero AG, www.nero.com
+deadbeef-related modifications (c) 2009-2014 Alexey Yakovenko
+
+Relies on libfaad2
+Code from FAAD2 is copyright (c) Nero AG, www.nero.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.
+
diff --git a/plugins/aac/Makefile.am b/plugins/aac/Makefile.am
index 642219b..1669db2 100644
--- a/plugins/aac/Makefile.am
+++ b/plugins/aac/Makefile.am
@@ -3,9 +3,9 @@ aacpath=@top_srcdir@/plugins/aac
 aacdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = aac.la
 aac_la_SOURCES = aac.c aac_parser.c aac_parser.h
-aac_la_LDFLAGS = -module
+aac_la_LDFLAGS = -module -avoid-version
 
 aac_la_LIBADD = $(LDADD) $(FAAD2_LIBS) ../libmp4ff/libmp4ff.a
-AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING -I at top_srcdir@/plugins/libmp4ff
+AM_CFLAGS = -I at top_srcdir@/plugins/libmp4ff $(CFLAGS) $(FAAD2_CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING
 endif
 
diff --git a/plugins/aac/Makefile.in b/plugins/aac/Makefile.in
index ac0b45d..6b16032 100644
--- a/plugins/aac/Makefile.in
+++ b/plugins/aac/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/aac
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -115,23 +143,48 @@ am__DEPENDENCIES_1 =
 am__aac_la_SOURCES_DIST = aac.c aac_parser.c aac_parser.h
 @HAVE_AAC_TRUE at am_aac_la_OBJECTS = aac.lo aac_parser.lo
 aac_la_OBJECTS = $(am_aac_la_OBJECTS)
-aac_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(aac_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+aac_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(aac_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_AAC_TRUE at am_aac_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(aac_la_SOURCES)
 DIST_SOURCES = $(am__aac_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -139,6 +192,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -165,6 +235,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -185,10 +256,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -211,6 +284,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -264,6 +338,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -282,6 +357,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -307,13 +384,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -322,7 +403,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -384,9 +467,9 @@ top_srcdir = @top_srcdir@
 @HAVE_AAC_TRUE at aacdir = $(libdir)/$(PACKAGE)
 @HAVE_AAC_TRUE at pkglib_LTLIBRARIES = aac.la
 @HAVE_AAC_TRUE at aac_la_SOURCES = aac.c aac_parser.c aac_parser.h
- at HAVE_AAC_TRUE@aac_la_LDFLAGS = -module
+ at HAVE_AAC_TRUE@aac_la_LDFLAGS = -module -avoid-version
 @HAVE_AAC_TRUE at aac_la_LIBADD = $(LDADD) $(FAAD2_LIBS) ../libmp4ff/libmp4ff.a
- at HAVE_AAC_TRUE@AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING -I at top_srcdir@/plugins/libmp4ff
+ at HAVE_AAC_TRUE@AM_CFLAGS = -I at top_srcdir@/plugins/libmp4ff $(CFLAGS) $(FAAD2_CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING
 all: all-am
 
 .SUFFIXES:
@@ -421,6 +504,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -447,14 +531,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 aac.la: $(aac_la_OBJECTS) $(aac_la_DEPENDENCIES) $(EXTRA_aac_la_DEPENDENCIES) 
-	$(aac_la_LINK) $(am_aac_la_rpath) $(aac_la_OBJECTS) $(aac_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(aac_la_LINK) $(am_aac_la_rpath) $(aac_la_OBJECTS) $(aac_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -466,25 +553,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aac_parser.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -492,26 +579,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -523,15 +599,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -540,6 +612,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -684,19 +771,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/aac/aac.c b/plugins/aac/aac.c
index 32f4fd0..abee977 100644
--- a/plugins/aac/aac.c
+++ b/plugins/aac/aac.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -253,8 +253,13 @@ mp4_track_get_info(mp4ff_t *mp4, int track, float *duration, int *samplerate, in
     samples = (int64_t)mp4ff_num_samples(mp4, track);
     
     NeAACDecClose (dec);
+    dec = NULL;
 
-    int i_sample_count = mp4ff_num_samples (mp4, track);
+    if (samples <= 0) {
+        goto error;
+    }
+
+    int i_sample_count = samples;
     int i_sample;
 
     int64_t total_dur = 0;
@@ -477,13 +482,20 @@ aac_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
             info->endsample = totalsamples-1;
         }
     }
+    if (_info->fmt.channels == 7) {
+        _info->fmt.channels = 8;
+    }
+
     trace ("totalsamples: %d, endsample: %d, samples-from-duration: %d, samplerate %d, channels %d\n", totalsamples-1, info->endsample, (int)deadbeef->pl_get_item_duration (it)*44100, _info->fmt.samplerate, _info->fmt.channels);
 
     for (int i = 0; i < _info->fmt.channels; i++) {
         _info->fmt.channelmask |= 1 << i;
     }
     info->noremap = 0;
-    info->remap[0] = -1;
+    for (int i = 0; i < sizeof (info->remap) / sizeof (int); i++) {
+        info->remap[i] = -1;
+    }
+
     trace ("init success\n");
 
     return 0;
@@ -550,44 +562,43 @@ aac_read (DB_fileinfo_t *_info, char *bytes, int size) {
                 int i, j;
                 if (info->remap[0] == -1) {
                     // build remap mtx
-
                     // FIXME: should build channelmask 1st; then remap based on channelmask
                     for (i = 0; i < _info->fmt.channels; i++) {
                         switch (info->frame_info.channel_position[i]) {
                         case FRONT_CHANNEL_CENTER:
-                            trace ("FC->%d\n", i);
+                            trace ("FC->%d %d\n", i, 2);
                             info->remap[2] = i;
                             break;
                         case FRONT_CHANNEL_LEFT:
-                            trace ("FL->%d\n", i);
+                            trace ("FL->%d %d\n", i, 0);
                             info->remap[0] = i;
                             break;
                         case FRONT_CHANNEL_RIGHT:
-                            trace ("FR->%d\n", i);
+                            trace ("FR->%d %d\n", i, 1);
                             info->remap[1] = i;
                             break;
                         case SIDE_CHANNEL_LEFT:
-                            trace ("SL->%d\n", i);
+                            trace ("SL->%d %d\n", i, 6);
                             info->remap[6] = i;
                             break;
                         case SIDE_CHANNEL_RIGHT:
-                            trace ("SR->%d\n", i);
+                            trace ("SR->%d %d\n", i, 7);
                             info->remap[7] = i;
                             break;
                         case BACK_CHANNEL_LEFT:
-                            trace ("RL->%d\n", i);
+                            trace ("RL->%d %d\n", i, 4);
                             info->remap[4] = i;
                             break;
                         case BACK_CHANNEL_RIGHT:
-                            trace ("RR->%d\n", i);
+                            trace ("RR->%d %d\n", i, 5);
                             info->remap[5] = i;
                             break;
                         case BACK_CHANNEL_CENTER:
-                            trace ("BC->%d\n", i);
+                            trace ("BC->%d %d\n", i, 8);
                             info->remap[8] = i;
                             break;
                         case LFE_CHANNEL:
-                            trace ("LFE->%d\n", i);
+                            trace ("LFE->%d %d\n", i, 3);
                             info->remap[3] = i;
                             break;
                         default:
@@ -610,7 +621,12 @@ aac_read (DB_fileinfo_t *_info, char *bytes, int size) {
 
                 for (i = 0; i < n; i++) {
                     for (j = 0; j < _info->fmt.channels; j++) {
-                        ((int16_t *)bytes)[j] = ((int16_t *)src)[info->remap[j]];
+                        if (info->remap[j] == -1) {
+                            ((int16_t *)bytes)[j] = 0;
+                        }
+                        else {
+                            ((int16_t *)bytes)[j] = ((int16_t *)src)[info->remap[j]];
+                        }
                     }
                     src += samplesize;
                     bytes += samplesize;
@@ -837,6 +853,7 @@ static const char *metainfo[] = {
     "copyright", "copyright",
     "totaltracks", "numtracks",
     "tool", "tool",
+    "MusicBrainz Track Id", "musicbrainz_trackid",
     NULL
 };
 
diff --git a/plugins/aac/aac_parser.c b/plugins/aac/aac_parser.c
index 3a25622..8214eac 100644
--- a/plugins/aac/aac_parser.c
+++ b/plugins/aac/aac_parser.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/aac/aac_parser.h b/plugins/aac/aac_parser.h
index 255b58e..315d789 100644
--- a/plugins/aac/aac_parser.h
+++ b/plugins/aac/aac_parser.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/adplug/COPYING b/plugins/adplug/COPYING
new file mode 100644
index 0000000..8dcb955
--- /dev/null
+++ b/plugins/adplug/COPYING
@@ -0,0 +1,40 @@
+ADPLUG DeaDBeeF Player Plugin
+Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+adplug (modified)
+Copyright (C) 1999 - 2006 Simon Peter, <dn.tlp at gmx.net>, et al.
+deadbeef-related modifications (c) 2009-2014 Alexey Yakovenko
+
+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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
diff --git a/plugins/adplug/Makefile.am b/plugins/adplug/Makefile.am
index 398f23c..68f42af 100644
--- a/plugins/adplug/Makefile.am
+++ b/plugins/adplug/Makefile.am
@@ -5,7 +5,7 @@ adlibdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = adplug.la
 
 AM_CFLAGS = $(CFLAGS) -std=c99 -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fPIC
-adplug_la_LDFLAGS = -module $(NOCPPLIB) -lm
+adplug_la_LDFLAGS = -module -avoid-version $(NOCPPLIB) -lm
 
 AM_CPPFLAGS = $(CXXFLAGS) -Dstricmp=strcasecmp -DVERSION=\"2.1\" -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fno-exceptions -fno-rtti -fno-unwind-tables
 
diff --git a/plugins/adplug/Makefile.in b/plugins/adplug/Makefile.in
index 83894b8..8eaefe3 100644
--- a/plugins/adplug/Makefile.in
+++ b/plugins/adplug/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/adplug
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -158,32 +186,66 @@ am__adplug_la_SOURCES_DIST = plugin.c adplug-db.cpp libbinio/binfile.h \
 @HAVE_ADPLUG_TRUE@	rol.lo s3m.lo sa2.lo sng.lo surroundopl.lo \
 @HAVE_ADPLUG_TRUE@	temuopl.lo u6m.lo xad.lo xsm.lo
 adplug_la_OBJECTS = $(am_adplug_la_OBJECTS)
-adplug_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+adplug_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(adplug_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_ADPLUG_TRUE at am_adplug_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_ at AM_V@)
+am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(adplug_la_SOURCES)
 DIST_SOURCES = $(am__adplug_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -191,6 +253,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -217,6 +296,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -237,10 +317,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -263,6 +345,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -316,6 +399,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -334,6 +418,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -359,13 +445,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -374,7 +464,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -436,7 +528,7 @@ top_srcdir = @top_srcdir@
 @HAVE_ADPLUG_TRUE at adlibdir = $(libdir)/$(PACKAGE)
 @HAVE_ADPLUG_TRUE at pkglib_LTLIBRARIES = adplug.la
 @HAVE_ADPLUG_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fPIC
- at HAVE_ADPLUG_TRUE@adplug_la_LDFLAGS = -module $(NOCPPLIB) -lm
+ at HAVE_ADPLUG_TRUE@adplug_la_LDFLAGS = -module -avoid-version $(NOCPPLIB) -lm
 @HAVE_ADPLUG_TRUE at AM_CPPFLAGS = $(CXXFLAGS) -Dstricmp=strcasecmp -DVERSION=\"2.1\" -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fno-exceptions -fno-rtti -fno-unwind-tables
 @HAVE_ADPLUG_TRUE at adplug_la_SOURCES = plugin.c\
 @HAVE_ADPLUG_TRUE@                   adplug-db.cpp\
@@ -595,6 +687,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -621,14 +714,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 adplug.la: $(adplug_la_OBJECTS) $(adplug_la_DEPENDENCIES) $(EXTRA_adplug_la_DEPENDENCIES) 
-	$(adplug_la_LINK) $(am_adplug_la_rpath) $(adplug_la_OBJECTS) $(adplug_la_LIBADD) $(LIBS)
+	$(AM_V_CXXLD)$(adplug_la_LINK) $(am_adplug_la_rpath) $(adplug_la_OBJECTS) $(adplug_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -698,452 +794,452 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xsm.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 adlibemu.lo: adplug/adlibemu.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT adlibemu.lo -MD -MP -MF $(DEPDIR)/adlibemu.Tpo -c -o adlibemu.lo `test -f 'adplug/adlibemu.c' || echo '$(srcdir)/'`adplug/adlibemu.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/adlibemu.Tpo $(DEPDIR)/adlibemu.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adplug/adlibemu.c' object='adlibemu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT adlibemu.lo -MD -MP -MF $(DEPDIR)/adlibemu.Tpo -c -o adlibemu.lo `test -f 'adplug/adlibemu.c' || echo '$(srcdir)/'`adplug/adlibemu.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/adlibemu.Tpo $(DEPDIR)/adlibemu.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='adplug/adlibemu.c' object='adlibemu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adlibemu.lo `test -f 'adplug/adlibemu.c' || echo '$(srcdir)/'`adplug/adlibemu.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adlibemu.lo `test -f 'adplug/adlibemu.c' || echo '$(srcdir)/'`adplug/adlibemu.c
 
 debug.lo: adplug/debug.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT debug.lo -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.lo `test -f 'adplug/debug.c' || echo '$(srcdir)/'`adplug/debug.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adplug/debug.c' object='debug.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT debug.lo -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.lo `test -f 'adplug/debug.c' || echo '$(srcdir)/'`adplug/debug.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='adplug/debug.c' object='debug.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o debug.lo `test -f 'adplug/debug.c' || echo '$(srcdir)/'`adplug/debug.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o debug.lo `test -f 'adplug/debug.c' || echo '$(srcdir)/'`adplug/debug.c
 
 fmopl.lo: adplug/fmopl.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fmopl.lo -MD -MP -MF $(DEPDIR)/fmopl.Tpo -c -o fmopl.lo `test -f 'adplug/fmopl.c' || echo '$(srcdir)/'`adplug/fmopl.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/fmopl.Tpo $(DEPDIR)/fmopl.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adplug/fmopl.c' object='fmopl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fmopl.lo -MD -MP -MF $(DEPDIR)/fmopl.Tpo -c -o fmopl.lo `test -f 'adplug/fmopl.c' || echo '$(srcdir)/'`adplug/fmopl.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/fmopl.Tpo $(DEPDIR)/fmopl.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='adplug/fmopl.c' object='fmopl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fmopl.lo `test -f 'adplug/fmopl.c' || echo '$(srcdir)/'`adplug/fmopl.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fmopl.lo `test -f 'adplug/fmopl.c' || echo '$(srcdir)/'`adplug/fmopl.c
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 binfile.lo: libbinio/binfile.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binfile.lo -MD -MP -MF $(DEPDIR)/binfile.Tpo -c -o binfile.lo `test -f 'libbinio/binfile.cpp' || echo '$(srcdir)/'`libbinio/binfile.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/binfile.Tpo $(DEPDIR)/binfile.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='libbinio/binfile.cpp' object='binfile.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binfile.lo -MD -MP -MF $(DEPDIR)/binfile.Tpo -c -o binfile.lo `test -f 'libbinio/binfile.cpp' || echo '$(srcdir)/'`libbinio/binfile.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/binfile.Tpo $(DEPDIR)/binfile.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='libbinio/binfile.cpp' object='binfile.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binfile.lo `test -f 'libbinio/binfile.cpp' || echo '$(srcdir)/'`libbinio/binfile.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binfile.lo `test -f 'libbinio/binfile.cpp' || echo '$(srcdir)/'`libbinio/binfile.cpp
 
 binio.lo: libbinio/binio.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binio.lo -MD -MP -MF $(DEPDIR)/binio.Tpo -c -o binio.lo `test -f 'libbinio/binio.cpp' || echo '$(srcdir)/'`libbinio/binio.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/binio.Tpo $(DEPDIR)/binio.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='libbinio/binio.cpp' object='binio.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binio.lo -MD -MP -MF $(DEPDIR)/binio.Tpo -c -o binio.lo `test -f 'libbinio/binio.cpp' || echo '$(srcdir)/'`libbinio/binio.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/binio.Tpo $(DEPDIR)/binio.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='libbinio/binio.cpp' object='binio.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binio.lo `test -f 'libbinio/binio.cpp' || echo '$(srcdir)/'`libbinio/binio.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binio.lo `test -f 'libbinio/binio.cpp' || echo '$(srcdir)/'`libbinio/binio.cpp
 
 binstr.lo: libbinio/binstr.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binstr.lo -MD -MP -MF $(DEPDIR)/binstr.Tpo -c -o binstr.lo `test -f 'libbinio/binstr.cpp' || echo '$(srcdir)/'`libbinio/binstr.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/binstr.Tpo $(DEPDIR)/binstr.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='libbinio/binstr.cpp' object='binstr.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binstr.lo -MD -MP -MF $(DEPDIR)/binstr.Tpo -c -o binstr.lo `test -f 'libbinio/binstr.cpp' || echo '$(srcdir)/'`libbinio/binstr.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/binstr.Tpo $(DEPDIR)/binstr.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='libbinio/binstr.cpp' object='binstr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binstr.lo `test -f 'libbinio/binstr.cpp' || echo '$(srcdir)/'`libbinio/binstr.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binstr.lo `test -f 'libbinio/binstr.cpp' || echo '$(srcdir)/'`libbinio/binstr.cpp
 
 binwrap.lo: libbinio/binwrap.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binwrap.lo -MD -MP -MF $(DEPDIR)/binwrap.Tpo -c -o binwrap.lo `test -f 'libbinio/binwrap.cpp' || echo '$(srcdir)/'`libbinio/binwrap.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/binwrap.Tpo $(DEPDIR)/binwrap.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='libbinio/binwrap.cpp' object='binwrap.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binwrap.lo -MD -MP -MF $(DEPDIR)/binwrap.Tpo -c -o binwrap.lo `test -f 'libbinio/binwrap.cpp' || echo '$(srcdir)/'`libbinio/binwrap.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/binwrap.Tpo $(DEPDIR)/binwrap.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='libbinio/binwrap.cpp' object='binwrap.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binwrap.lo `test -f 'libbinio/binwrap.cpp' || echo '$(srcdir)/'`libbinio/binwrap.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binwrap.lo `test -f 'libbinio/binwrap.cpp' || echo '$(srcdir)/'`libbinio/binwrap.cpp
 
 a2m.lo: adplug/a2m.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT a2m.lo -MD -MP -MF $(DEPDIR)/a2m.Tpo -c -o a2m.lo `test -f 'adplug/a2m.cpp' || echo '$(srcdir)/'`adplug/a2m.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/a2m.Tpo $(DEPDIR)/a2m.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/a2m.cpp' object='a2m.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT a2m.lo -MD -MP -MF $(DEPDIR)/a2m.Tpo -c -o a2m.lo `test -f 'adplug/a2m.cpp' || echo '$(srcdir)/'`adplug/a2m.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/a2m.Tpo $(DEPDIR)/a2m.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/a2m.cpp' object='a2m.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o a2m.lo `test -f 'adplug/a2m.cpp' || echo '$(srcdir)/'`adplug/a2m.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o a2m.lo `test -f 'adplug/a2m.cpp' || echo '$(srcdir)/'`adplug/a2m.cpp
 
 adl.lo: adplug/adl.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adl.lo -MD -MP -MF $(DEPDIR)/adl.Tpo -c -o adl.lo `test -f 'adplug/adl.cpp' || echo '$(srcdir)/'`adplug/adl.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/adl.Tpo $(DEPDIR)/adl.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/adl.cpp' object='adl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adl.lo -MD -MP -MF $(DEPDIR)/adl.Tpo -c -o adl.lo `test -f 'adplug/adl.cpp' || echo '$(srcdir)/'`adplug/adl.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/adl.Tpo $(DEPDIR)/adl.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/adl.cpp' object='adl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adl.lo `test -f 'adplug/adl.cpp' || echo '$(srcdir)/'`adplug/adl.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adl.lo `test -f 'adplug/adl.cpp' || echo '$(srcdir)/'`adplug/adl.cpp
 
 adplug.lo: adplug/adplug.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adplug.lo -MD -MP -MF $(DEPDIR)/adplug.Tpo -c -o adplug.lo `test -f 'adplug/adplug.cpp' || echo '$(srcdir)/'`adplug/adplug.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/adplug.Tpo $(DEPDIR)/adplug.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/adplug.cpp' object='adplug.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adplug.lo -MD -MP -MF $(DEPDIR)/adplug.Tpo -c -o adplug.lo `test -f 'adplug/adplug.cpp' || echo '$(srcdir)/'`adplug/adplug.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/adplug.Tpo $(DEPDIR)/adplug.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/adplug.cpp' object='adplug.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adplug.lo `test -f 'adplug/adplug.cpp' || echo '$(srcdir)/'`adplug/adplug.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adplug.lo `test -f 'adplug/adplug.cpp' || echo '$(srcdir)/'`adplug/adplug.cpp
 
 adtrack.lo: adplug/adtrack.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adtrack.lo -MD -MP -MF $(DEPDIR)/adtrack.Tpo -c -o adtrack.lo `test -f 'adplug/adtrack.cpp' || echo '$(srcdir)/'`adplug/adtrack.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/adtrack.Tpo $(DEPDIR)/adtrack.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/adtrack.cpp' object='adtrack.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adtrack.lo -MD -MP -MF $(DEPDIR)/adtrack.Tpo -c -o adtrack.lo `test -f 'adplug/adtrack.cpp' || echo '$(srcdir)/'`adplug/adtrack.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/adtrack.Tpo $(DEPDIR)/adtrack.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/adtrack.cpp' object='adtrack.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adtrack.lo `test -f 'adplug/adtrack.cpp' || echo '$(srcdir)/'`adplug/adtrack.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adtrack.lo `test -f 'adplug/adtrack.cpp' || echo '$(srcdir)/'`adplug/adtrack.cpp
 
 amd.lo: adplug/amd.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT amd.lo -MD -MP -MF $(DEPDIR)/amd.Tpo -c -o amd.lo `test -f 'adplug/amd.cpp' || echo '$(srcdir)/'`adplug/amd.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/amd.Tpo $(DEPDIR)/amd.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/amd.cpp' object='amd.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT amd.lo -MD -MP -MF $(DEPDIR)/amd.Tpo -c -o amd.lo `test -f 'adplug/amd.cpp' || echo '$(srcdir)/'`adplug/amd.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amd.Tpo $(DEPDIR)/amd.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/amd.cpp' object='amd.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o amd.lo `test -f 'adplug/amd.cpp' || echo '$(srcdir)/'`adplug/amd.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o amd.lo `test -f 'adplug/amd.cpp' || echo '$(srcdir)/'`adplug/amd.cpp
 
 analopl.lo: adplug/analopl.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT analopl.lo -MD -MP -MF $(DEPDIR)/analopl.Tpo -c -o analopl.lo `test -f 'adplug/analopl.cpp' || echo '$(srcdir)/'`adplug/analopl.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/analopl.Tpo $(DEPDIR)/analopl.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/analopl.cpp' object='analopl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT analopl.lo -MD -MP -MF $(DEPDIR)/analopl.Tpo -c -o analopl.lo `test -f 'adplug/analopl.cpp' || echo '$(srcdir)/'`adplug/analopl.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/analopl.Tpo $(DEPDIR)/analopl.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/analopl.cpp' object='analopl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o analopl.lo `test -f 'adplug/analopl.cpp' || echo '$(srcdir)/'`adplug/analopl.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o analopl.lo `test -f 'adplug/analopl.cpp' || echo '$(srcdir)/'`adplug/analopl.cpp
 
 bam.lo: adplug/bam.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bam.lo -MD -MP -MF $(DEPDIR)/bam.Tpo -c -o bam.lo `test -f 'adplug/bam.cpp' || echo '$(srcdir)/'`adplug/bam.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/bam.Tpo $(DEPDIR)/bam.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/bam.cpp' object='bam.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bam.lo -MD -MP -MF $(DEPDIR)/bam.Tpo -c -o bam.lo `test -f 'adplug/bam.cpp' || echo '$(srcdir)/'`adplug/bam.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/bam.Tpo $(DEPDIR)/bam.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/bam.cpp' object='bam.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bam.lo `test -f 'adplug/bam.cpp' || echo '$(srcdir)/'`adplug/bam.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bam.lo `test -f 'adplug/bam.cpp' || echo '$(srcdir)/'`adplug/bam.cpp
 
 bmf.lo: adplug/bmf.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bmf.lo -MD -MP -MF $(DEPDIR)/bmf.Tpo -c -o bmf.lo `test -f 'adplug/bmf.cpp' || echo '$(srcdir)/'`adplug/bmf.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/bmf.Tpo $(DEPDIR)/bmf.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/bmf.cpp' object='bmf.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bmf.lo -MD -MP -MF $(DEPDIR)/bmf.Tpo -c -o bmf.lo `test -f 'adplug/bmf.cpp' || echo '$(srcdir)/'`adplug/bmf.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/bmf.Tpo $(DEPDIR)/bmf.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/bmf.cpp' object='bmf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bmf.lo `test -f 'adplug/bmf.cpp' || echo '$(srcdir)/'`adplug/bmf.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bmf.lo `test -f 'adplug/bmf.cpp' || echo '$(srcdir)/'`adplug/bmf.cpp
 
 cff.lo: adplug/cff.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cff.lo -MD -MP -MF $(DEPDIR)/cff.Tpo -c -o cff.lo `test -f 'adplug/cff.cpp' || echo '$(srcdir)/'`adplug/cff.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/cff.Tpo $(DEPDIR)/cff.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/cff.cpp' object='cff.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cff.lo -MD -MP -MF $(DEPDIR)/cff.Tpo -c -o cff.lo `test -f 'adplug/cff.cpp' || echo '$(srcdir)/'`adplug/cff.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cff.Tpo $(DEPDIR)/cff.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/cff.cpp' object='cff.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cff.lo `test -f 'adplug/cff.cpp' || echo '$(srcdir)/'`adplug/cff.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cff.lo `test -f 'adplug/cff.cpp' || echo '$(srcdir)/'`adplug/cff.cpp
 
 d00.lo: adplug/d00.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT d00.lo -MD -MP -MF $(DEPDIR)/d00.Tpo -c -o d00.lo `test -f 'adplug/d00.cpp' || echo '$(srcdir)/'`adplug/d00.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/d00.Tpo $(DEPDIR)/d00.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/d00.cpp' object='d00.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT d00.lo -MD -MP -MF $(DEPDIR)/d00.Tpo -c -o d00.lo `test -f 'adplug/d00.cpp' || echo '$(srcdir)/'`adplug/d00.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/d00.Tpo $(DEPDIR)/d00.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/d00.cpp' object='d00.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o d00.lo `test -f 'adplug/d00.cpp' || echo '$(srcdir)/'`adplug/d00.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o d00.lo `test -f 'adplug/d00.cpp' || echo '$(srcdir)/'`adplug/d00.cpp
 
 dfm.lo: adplug/dfm.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dfm.lo -MD -MP -MF $(DEPDIR)/dfm.Tpo -c -o dfm.lo `test -f 'adplug/dfm.cpp' || echo '$(srcdir)/'`adplug/dfm.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dfm.Tpo $(DEPDIR)/dfm.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/dfm.cpp' object='dfm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dfm.lo -MD -MP -MF $(DEPDIR)/dfm.Tpo -c -o dfm.lo `test -f 'adplug/dfm.cpp' || echo '$(srcdir)/'`adplug/dfm.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dfm.Tpo $(DEPDIR)/dfm.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/dfm.cpp' object='dfm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dfm.lo `test -f 'adplug/dfm.cpp' || echo '$(srcdir)/'`adplug/dfm.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dfm.lo `test -f 'adplug/dfm.cpp' || echo '$(srcdir)/'`adplug/dfm.cpp
 
 diskopl.lo: adplug/diskopl.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT diskopl.lo -MD -MP -MF $(DEPDIR)/diskopl.Tpo -c -o diskopl.lo `test -f 'adplug/diskopl.cpp' || echo '$(srcdir)/'`adplug/diskopl.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/diskopl.Tpo $(DEPDIR)/diskopl.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/diskopl.cpp' object='diskopl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT diskopl.lo -MD -MP -MF $(DEPDIR)/diskopl.Tpo -c -o diskopl.lo `test -f 'adplug/diskopl.cpp' || echo '$(srcdir)/'`adplug/diskopl.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/diskopl.Tpo $(DEPDIR)/diskopl.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/diskopl.cpp' object='diskopl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o diskopl.lo `test -f 'adplug/diskopl.cpp' || echo '$(srcdir)/'`adplug/diskopl.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o diskopl.lo `test -f 'adplug/diskopl.cpp' || echo '$(srcdir)/'`adplug/diskopl.cpp
 
 dmo.lo: adplug/dmo.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dmo.lo -MD -MP -MF $(DEPDIR)/dmo.Tpo -c -o dmo.lo `test -f 'adplug/dmo.cpp' || echo '$(srcdir)/'`adplug/dmo.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dmo.Tpo $(DEPDIR)/dmo.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/dmo.cpp' object='dmo.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dmo.lo -MD -MP -MF $(DEPDIR)/dmo.Tpo -c -o dmo.lo `test -f 'adplug/dmo.cpp' || echo '$(srcdir)/'`adplug/dmo.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dmo.Tpo $(DEPDIR)/dmo.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/dmo.cpp' object='dmo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dmo.lo `test -f 'adplug/dmo.cpp' || echo '$(srcdir)/'`adplug/dmo.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dmo.lo `test -f 'adplug/dmo.cpp' || echo '$(srcdir)/'`adplug/dmo.cpp
 
 dro2.lo: adplug/dro2.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dro2.lo -MD -MP -MF $(DEPDIR)/dro2.Tpo -c -o dro2.lo `test -f 'adplug/dro2.cpp' || echo '$(srcdir)/'`adplug/dro2.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dro2.Tpo $(DEPDIR)/dro2.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/dro2.cpp' object='dro2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dro2.lo -MD -MP -MF $(DEPDIR)/dro2.Tpo -c -o dro2.lo `test -f 'adplug/dro2.cpp' || echo '$(srcdir)/'`adplug/dro2.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dro2.Tpo $(DEPDIR)/dro2.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/dro2.cpp' object='dro2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dro2.lo `test -f 'adplug/dro2.cpp' || echo '$(srcdir)/'`adplug/dro2.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dro2.lo `test -f 'adplug/dro2.cpp' || echo '$(srcdir)/'`adplug/dro2.cpp
 
 dro.lo: adplug/dro.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dro.lo -MD -MP -MF $(DEPDIR)/dro.Tpo -c -o dro.lo `test -f 'adplug/dro.cpp' || echo '$(srcdir)/'`adplug/dro.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dro.Tpo $(DEPDIR)/dro.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/dro.cpp' object='dro.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dro.lo -MD -MP -MF $(DEPDIR)/dro.Tpo -c -o dro.lo `test -f 'adplug/dro.cpp' || echo '$(srcdir)/'`adplug/dro.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dro.Tpo $(DEPDIR)/dro.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/dro.cpp' object='dro.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dro.lo `test -f 'adplug/dro.cpp' || echo '$(srcdir)/'`adplug/dro.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dro.lo `test -f 'adplug/dro.cpp' || echo '$(srcdir)/'`adplug/dro.cpp
 
 dtm.lo: adplug/dtm.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dtm.lo -MD -MP -MF $(DEPDIR)/dtm.Tpo -c -o dtm.lo `test -f 'adplug/dtm.cpp' || echo '$(srcdir)/'`adplug/dtm.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dtm.Tpo $(DEPDIR)/dtm.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/dtm.cpp' object='dtm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dtm.lo -MD -MP -MF $(DEPDIR)/dtm.Tpo -c -o dtm.lo `test -f 'adplug/dtm.cpp' || echo '$(srcdir)/'`adplug/dtm.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dtm.Tpo $(DEPDIR)/dtm.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/dtm.cpp' object='dtm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dtm.lo `test -f 'adplug/dtm.cpp' || echo '$(srcdir)/'`adplug/dtm.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dtm.lo `test -f 'adplug/dtm.cpp' || echo '$(srcdir)/'`adplug/dtm.cpp
 
 emuopl.lo: adplug/emuopl.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT emuopl.lo -MD -MP -MF $(DEPDIR)/emuopl.Tpo -c -o emuopl.lo `test -f 'adplug/emuopl.cpp' || echo '$(srcdir)/'`adplug/emuopl.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/emuopl.Tpo $(DEPDIR)/emuopl.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/emuopl.cpp' object='emuopl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT emuopl.lo -MD -MP -MF $(DEPDIR)/emuopl.Tpo -c -o emuopl.lo `test -f 'adplug/emuopl.cpp' || echo '$(srcdir)/'`adplug/emuopl.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/emuopl.Tpo $(DEPDIR)/emuopl.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/emuopl.cpp' object='emuopl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o emuopl.lo `test -f 'adplug/emuopl.cpp' || echo '$(srcdir)/'`adplug/emuopl.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o emuopl.lo `test -f 'adplug/emuopl.cpp' || echo '$(srcdir)/'`adplug/emuopl.cpp
 
 flash.lo: adplug/flash.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT flash.lo -MD -MP -MF $(DEPDIR)/flash.Tpo -c -o flash.lo `test -f 'adplug/flash.cpp' || echo '$(srcdir)/'`adplug/flash.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/flash.Tpo $(DEPDIR)/flash.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/flash.cpp' object='flash.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT flash.lo -MD -MP -MF $(DEPDIR)/flash.Tpo -c -o flash.lo `test -f 'adplug/flash.cpp' || echo '$(srcdir)/'`adplug/flash.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/flash.Tpo $(DEPDIR)/flash.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/flash.cpp' object='flash.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o flash.lo `test -f 'adplug/flash.cpp' || echo '$(srcdir)/'`adplug/flash.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o flash.lo `test -f 'adplug/flash.cpp' || echo '$(srcdir)/'`adplug/flash.cpp
 
 fmc.lo: adplug/fmc.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fmc.lo -MD -MP -MF $(DEPDIR)/fmc.Tpo -c -o fmc.lo `test -f 'adplug/fmc.cpp' || echo '$(srcdir)/'`adplug/fmc.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/fmc.Tpo $(DEPDIR)/fmc.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/fmc.cpp' object='fmc.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fmc.lo -MD -MP -MF $(DEPDIR)/fmc.Tpo -c -o fmc.lo `test -f 'adplug/fmc.cpp' || echo '$(srcdir)/'`adplug/fmc.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/fmc.Tpo $(DEPDIR)/fmc.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/fmc.cpp' object='fmc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fmc.lo `test -f 'adplug/fmc.cpp' || echo '$(srcdir)/'`adplug/fmc.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fmc.lo `test -f 'adplug/fmc.cpp' || echo '$(srcdir)/'`adplug/fmc.cpp
 
 fprovide.lo: adplug/fprovide.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fprovide.lo -MD -MP -MF $(DEPDIR)/fprovide.Tpo -c -o fprovide.lo `test -f 'adplug/fprovide.cpp' || echo '$(srcdir)/'`adplug/fprovide.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/fprovide.Tpo $(DEPDIR)/fprovide.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/fprovide.cpp' object='fprovide.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fprovide.lo -MD -MP -MF $(DEPDIR)/fprovide.Tpo -c -o fprovide.lo `test -f 'adplug/fprovide.cpp' || echo '$(srcdir)/'`adplug/fprovide.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/fprovide.Tpo $(DEPDIR)/fprovide.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/fprovide.cpp' object='fprovide.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fprovide.lo `test -f 'adplug/fprovide.cpp' || echo '$(srcdir)/'`adplug/fprovide.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fprovide.lo `test -f 'adplug/fprovide.cpp' || echo '$(srcdir)/'`adplug/fprovide.cpp
 
 hsc.lo: adplug/hsc.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hsc.lo -MD -MP -MF $(DEPDIR)/hsc.Tpo -c -o hsc.lo `test -f 'adplug/hsc.cpp' || echo '$(srcdir)/'`adplug/hsc.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/hsc.Tpo $(DEPDIR)/hsc.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/hsc.cpp' object='hsc.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hsc.lo -MD -MP -MF $(DEPDIR)/hsc.Tpo -c -o hsc.lo `test -f 'adplug/hsc.cpp' || echo '$(srcdir)/'`adplug/hsc.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hsc.Tpo $(DEPDIR)/hsc.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/hsc.cpp' object='hsc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hsc.lo `test -f 'adplug/hsc.cpp' || echo '$(srcdir)/'`adplug/hsc.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hsc.lo `test -f 'adplug/hsc.cpp' || echo '$(srcdir)/'`adplug/hsc.cpp
 
 hsp.lo: adplug/hsp.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hsp.lo -MD -MP -MF $(DEPDIR)/hsp.Tpo -c -o hsp.lo `test -f 'adplug/hsp.cpp' || echo '$(srcdir)/'`adplug/hsp.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/hsp.Tpo $(DEPDIR)/hsp.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/hsp.cpp' object='hsp.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hsp.lo -MD -MP -MF $(DEPDIR)/hsp.Tpo -c -o hsp.lo `test -f 'adplug/hsp.cpp' || echo '$(srcdir)/'`adplug/hsp.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hsp.Tpo $(DEPDIR)/hsp.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/hsp.cpp' object='hsp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hsp.lo `test -f 'adplug/hsp.cpp' || echo '$(srcdir)/'`adplug/hsp.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hsp.lo `test -f 'adplug/hsp.cpp' || echo '$(srcdir)/'`adplug/hsp.cpp
 
 hybrid.lo: adplug/hybrid.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hybrid.lo -MD -MP -MF $(DEPDIR)/hybrid.Tpo -c -o hybrid.lo `test -f 'adplug/hybrid.cpp' || echo '$(srcdir)/'`adplug/hybrid.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/hybrid.Tpo $(DEPDIR)/hybrid.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/hybrid.cpp' object='hybrid.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hybrid.lo -MD -MP -MF $(DEPDIR)/hybrid.Tpo -c -o hybrid.lo `test -f 'adplug/hybrid.cpp' || echo '$(srcdir)/'`adplug/hybrid.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hybrid.Tpo $(DEPDIR)/hybrid.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/hybrid.cpp' object='hybrid.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hybrid.lo `test -f 'adplug/hybrid.cpp' || echo '$(srcdir)/'`adplug/hybrid.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hybrid.lo `test -f 'adplug/hybrid.cpp' || echo '$(srcdir)/'`adplug/hybrid.cpp
 
 hyp.lo: adplug/hyp.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hyp.lo -MD -MP -MF $(DEPDIR)/hyp.Tpo -c -o hyp.lo `test -f 'adplug/hyp.cpp' || echo '$(srcdir)/'`adplug/hyp.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/hyp.Tpo $(DEPDIR)/hyp.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/hyp.cpp' object='hyp.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hyp.lo -MD -MP -MF $(DEPDIR)/hyp.Tpo -c -o hyp.lo `test -f 'adplug/hyp.cpp' || echo '$(srcdir)/'`adplug/hyp.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hyp.Tpo $(DEPDIR)/hyp.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/hyp.cpp' object='hyp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hyp.lo `test -f 'adplug/hyp.cpp' || echo '$(srcdir)/'`adplug/hyp.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hyp.lo `test -f 'adplug/hyp.cpp' || echo '$(srcdir)/'`adplug/hyp.cpp
 
 imf.lo: adplug/imf.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT imf.lo -MD -MP -MF $(DEPDIR)/imf.Tpo -c -o imf.lo `test -f 'adplug/imf.cpp' || echo '$(srcdir)/'`adplug/imf.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/imf.Tpo $(DEPDIR)/imf.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/imf.cpp' object='imf.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT imf.lo -MD -MP -MF $(DEPDIR)/imf.Tpo -c -o imf.lo `test -f 'adplug/imf.cpp' || echo '$(srcdir)/'`adplug/imf.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imf.Tpo $(DEPDIR)/imf.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/imf.cpp' object='imf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o imf.lo `test -f 'adplug/imf.cpp' || echo '$(srcdir)/'`adplug/imf.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o imf.lo `test -f 'adplug/imf.cpp' || echo '$(srcdir)/'`adplug/imf.cpp
 
 jbm.lo: adplug/jbm.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jbm.lo -MD -MP -MF $(DEPDIR)/jbm.Tpo -c -o jbm.lo `test -f 'adplug/jbm.cpp' || echo '$(srcdir)/'`adplug/jbm.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/jbm.Tpo $(DEPDIR)/jbm.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/jbm.cpp' object='jbm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jbm.lo -MD -MP -MF $(DEPDIR)/jbm.Tpo -c -o jbm.lo `test -f 'adplug/jbm.cpp' || echo '$(srcdir)/'`adplug/jbm.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/jbm.Tpo $(DEPDIR)/jbm.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/jbm.cpp' object='jbm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jbm.lo `test -f 'adplug/jbm.cpp' || echo '$(srcdir)/'`adplug/jbm.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jbm.lo `test -f 'adplug/jbm.cpp' || echo '$(srcdir)/'`adplug/jbm.cpp
 
 ksm.lo: adplug/ksm.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ksm.lo -MD -MP -MF $(DEPDIR)/ksm.Tpo -c -o ksm.lo `test -f 'adplug/ksm.cpp' || echo '$(srcdir)/'`adplug/ksm.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/ksm.Tpo $(DEPDIR)/ksm.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/ksm.cpp' object='ksm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ksm.lo -MD -MP -MF $(DEPDIR)/ksm.Tpo -c -o ksm.lo `test -f 'adplug/ksm.cpp' || echo '$(srcdir)/'`adplug/ksm.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ksm.Tpo $(DEPDIR)/ksm.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/ksm.cpp' object='ksm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ksm.lo `test -f 'adplug/ksm.cpp' || echo '$(srcdir)/'`adplug/ksm.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ksm.lo `test -f 'adplug/ksm.cpp' || echo '$(srcdir)/'`adplug/ksm.cpp
 
 lds.lo: adplug/lds.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lds.lo -MD -MP -MF $(DEPDIR)/lds.Tpo -c -o lds.lo `test -f 'adplug/lds.cpp' || echo '$(srcdir)/'`adplug/lds.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/lds.Tpo $(DEPDIR)/lds.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/lds.cpp' object='lds.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lds.lo -MD -MP -MF $(DEPDIR)/lds.Tpo -c -o lds.lo `test -f 'adplug/lds.cpp' || echo '$(srcdir)/'`adplug/lds.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lds.Tpo $(DEPDIR)/lds.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/lds.cpp' object='lds.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lds.lo `test -f 'adplug/lds.cpp' || echo '$(srcdir)/'`adplug/lds.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lds.lo `test -f 'adplug/lds.cpp' || echo '$(srcdir)/'`adplug/lds.cpp
 
 mad.lo: adplug/mad.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mad.lo -MD -MP -MF $(DEPDIR)/mad.Tpo -c -o mad.lo `test -f 'adplug/mad.cpp' || echo '$(srcdir)/'`adplug/mad.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mad.Tpo $(DEPDIR)/mad.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/mad.cpp' object='mad.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mad.lo -MD -MP -MF $(DEPDIR)/mad.Tpo -c -o mad.lo `test -f 'adplug/mad.cpp' || echo '$(srcdir)/'`adplug/mad.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mad.Tpo $(DEPDIR)/mad.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/mad.cpp' object='mad.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mad.lo `test -f 'adplug/mad.cpp' || echo '$(srcdir)/'`adplug/mad.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mad.lo `test -f 'adplug/mad.cpp' || echo '$(srcdir)/'`adplug/mad.cpp
 
 mid.lo: adplug/mid.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mid.lo -MD -MP -MF $(DEPDIR)/mid.Tpo -c -o mid.lo `test -f 'adplug/mid.cpp' || echo '$(srcdir)/'`adplug/mid.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mid.Tpo $(DEPDIR)/mid.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/mid.cpp' object='mid.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mid.lo -MD -MP -MF $(DEPDIR)/mid.Tpo -c -o mid.lo `test -f 'adplug/mid.cpp' || echo '$(srcdir)/'`adplug/mid.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mid.Tpo $(DEPDIR)/mid.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/mid.cpp' object='mid.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mid.lo `test -f 'adplug/mid.cpp' || echo '$(srcdir)/'`adplug/mid.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mid.lo `test -f 'adplug/mid.cpp' || echo '$(srcdir)/'`adplug/mid.cpp
 
 mkj.lo: adplug/mkj.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mkj.lo -MD -MP -MF $(DEPDIR)/mkj.Tpo -c -o mkj.lo `test -f 'adplug/mkj.cpp' || echo '$(srcdir)/'`adplug/mkj.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mkj.Tpo $(DEPDIR)/mkj.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/mkj.cpp' object='mkj.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mkj.lo -MD -MP -MF $(DEPDIR)/mkj.Tpo -c -o mkj.lo `test -f 'adplug/mkj.cpp' || echo '$(srcdir)/'`adplug/mkj.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mkj.Tpo $(DEPDIR)/mkj.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/mkj.cpp' object='mkj.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mkj.lo `test -f 'adplug/mkj.cpp' || echo '$(srcdir)/'`adplug/mkj.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mkj.lo `test -f 'adplug/mkj.cpp' || echo '$(srcdir)/'`adplug/mkj.cpp
 
 msc.lo: adplug/msc.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT msc.lo -MD -MP -MF $(DEPDIR)/msc.Tpo -c -o msc.lo `test -f 'adplug/msc.cpp' || echo '$(srcdir)/'`adplug/msc.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/msc.Tpo $(DEPDIR)/msc.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/msc.cpp' object='msc.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT msc.lo -MD -MP -MF $(DEPDIR)/msc.Tpo -c -o msc.lo `test -f 'adplug/msc.cpp' || echo '$(srcdir)/'`adplug/msc.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/msc.Tpo $(DEPDIR)/msc.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/msc.cpp' object='msc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msc.lo `test -f 'adplug/msc.cpp' || echo '$(srcdir)/'`adplug/msc.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msc.lo `test -f 'adplug/msc.cpp' || echo '$(srcdir)/'`adplug/msc.cpp
 
 mtk.lo: adplug/mtk.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mtk.lo -MD -MP -MF $(DEPDIR)/mtk.Tpo -c -o mtk.lo `test -f 'adplug/mtk.cpp' || echo '$(srcdir)/'`adplug/mtk.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mtk.Tpo $(DEPDIR)/mtk.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/mtk.cpp' object='mtk.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mtk.lo -MD -MP -MF $(DEPDIR)/mtk.Tpo -c -o mtk.lo `test -f 'adplug/mtk.cpp' || echo '$(srcdir)/'`adplug/mtk.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mtk.Tpo $(DEPDIR)/mtk.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/mtk.cpp' object='mtk.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mtk.lo `test -f 'adplug/mtk.cpp' || echo '$(srcdir)/'`adplug/mtk.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mtk.lo `test -f 'adplug/mtk.cpp' || echo '$(srcdir)/'`adplug/mtk.cpp
 
 player.lo: adplug/player.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT player.lo -MD -MP -MF $(DEPDIR)/player.Tpo -c -o player.lo `test -f 'adplug/player.cpp' || echo '$(srcdir)/'`adplug/player.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/player.Tpo $(DEPDIR)/player.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/player.cpp' object='player.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT player.lo -MD -MP -MF $(DEPDIR)/player.Tpo -c -o player.lo `test -f 'adplug/player.cpp' || echo '$(srcdir)/'`adplug/player.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/player.Tpo $(DEPDIR)/player.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/player.cpp' object='player.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.lo `test -f 'adplug/player.cpp' || echo '$(srcdir)/'`adplug/player.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.lo `test -f 'adplug/player.cpp' || echo '$(srcdir)/'`adplug/player.cpp
 
 players.lo: adplug/players.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT players.lo -MD -MP -MF $(DEPDIR)/players.Tpo -c -o players.lo `test -f 'adplug/players.cpp' || echo '$(srcdir)/'`adplug/players.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/players.Tpo $(DEPDIR)/players.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/players.cpp' object='players.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT players.lo -MD -MP -MF $(DEPDIR)/players.Tpo -c -o players.lo `test -f 'adplug/players.cpp' || echo '$(srcdir)/'`adplug/players.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/players.Tpo $(DEPDIR)/players.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/players.cpp' object='players.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o players.lo `test -f 'adplug/players.cpp' || echo '$(srcdir)/'`adplug/players.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o players.lo `test -f 'adplug/players.cpp' || echo '$(srcdir)/'`adplug/players.cpp
 
 protrack.lo: adplug/protrack.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT protrack.lo -MD -MP -MF $(DEPDIR)/protrack.Tpo -c -o protrack.lo `test -f 'adplug/protrack.cpp' || echo '$(srcdir)/'`adplug/protrack.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/protrack.Tpo $(DEPDIR)/protrack.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/protrack.cpp' object='protrack.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT protrack.lo -MD -MP -MF $(DEPDIR)/protrack.Tpo -c -o protrack.lo `test -f 'adplug/protrack.cpp' || echo '$(srcdir)/'`adplug/protrack.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/protrack.Tpo $(DEPDIR)/protrack.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/protrack.cpp' object='protrack.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o protrack.lo `test -f 'adplug/protrack.cpp' || echo '$(srcdir)/'`adplug/protrack.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o protrack.lo `test -f 'adplug/protrack.cpp' || echo '$(srcdir)/'`adplug/protrack.cpp
 
 psi.lo: adplug/psi.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT psi.lo -MD -MP -MF $(DEPDIR)/psi.Tpo -c -o psi.lo `test -f 'adplug/psi.cpp' || echo '$(srcdir)/'`adplug/psi.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/psi.Tpo $(DEPDIR)/psi.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/psi.cpp' object='psi.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT psi.lo -MD -MP -MF $(DEPDIR)/psi.Tpo -c -o psi.lo `test -f 'adplug/psi.cpp' || echo '$(srcdir)/'`adplug/psi.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/psi.Tpo $(DEPDIR)/psi.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/psi.cpp' object='psi.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o psi.lo `test -f 'adplug/psi.cpp' || echo '$(srcdir)/'`adplug/psi.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o psi.lo `test -f 'adplug/psi.cpp' || echo '$(srcdir)/'`adplug/psi.cpp
 
 rad.lo: adplug/rad.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rad.lo -MD -MP -MF $(DEPDIR)/rad.Tpo -c -o rad.lo `test -f 'adplug/rad.cpp' || echo '$(srcdir)/'`adplug/rad.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/rad.Tpo $(DEPDIR)/rad.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/rad.cpp' object='rad.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rad.lo -MD -MP -MF $(DEPDIR)/rad.Tpo -c -o rad.lo `test -f 'adplug/rad.cpp' || echo '$(srcdir)/'`adplug/rad.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rad.Tpo $(DEPDIR)/rad.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/rad.cpp' object='rad.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rad.lo `test -f 'adplug/rad.cpp' || echo '$(srcdir)/'`adplug/rad.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rad.lo `test -f 'adplug/rad.cpp' || echo '$(srcdir)/'`adplug/rad.cpp
 
 rat.lo: adplug/rat.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rat.lo -MD -MP -MF $(DEPDIR)/rat.Tpo -c -o rat.lo `test -f 'adplug/rat.cpp' || echo '$(srcdir)/'`adplug/rat.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/rat.Tpo $(DEPDIR)/rat.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/rat.cpp' object='rat.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rat.lo -MD -MP -MF $(DEPDIR)/rat.Tpo -c -o rat.lo `test -f 'adplug/rat.cpp' || echo '$(srcdir)/'`adplug/rat.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rat.Tpo $(DEPDIR)/rat.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/rat.cpp' object='rat.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rat.lo `test -f 'adplug/rat.cpp' || echo '$(srcdir)/'`adplug/rat.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rat.lo `test -f 'adplug/rat.cpp' || echo '$(srcdir)/'`adplug/rat.cpp
 
 raw.lo: adplug/raw.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT raw.lo -MD -MP -MF $(DEPDIR)/raw.Tpo -c -o raw.lo `test -f 'adplug/raw.cpp' || echo '$(srcdir)/'`adplug/raw.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/raw.Tpo $(DEPDIR)/raw.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/raw.cpp' object='raw.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT raw.lo -MD -MP -MF $(DEPDIR)/raw.Tpo -c -o raw.lo `test -f 'adplug/raw.cpp' || echo '$(srcdir)/'`adplug/raw.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/raw.Tpo $(DEPDIR)/raw.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/raw.cpp' object='raw.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o raw.lo `test -f 'adplug/raw.cpp' || echo '$(srcdir)/'`adplug/raw.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o raw.lo `test -f 'adplug/raw.cpp' || echo '$(srcdir)/'`adplug/raw.cpp
 
 realopl.lo: adplug/realopl.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT realopl.lo -MD -MP -MF $(DEPDIR)/realopl.Tpo -c -o realopl.lo `test -f 'adplug/realopl.cpp' || echo '$(srcdir)/'`adplug/realopl.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/realopl.Tpo $(DEPDIR)/realopl.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/realopl.cpp' object='realopl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT realopl.lo -MD -MP -MF $(DEPDIR)/realopl.Tpo -c -o realopl.lo `test -f 'adplug/realopl.cpp' || echo '$(srcdir)/'`adplug/realopl.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/realopl.Tpo $(DEPDIR)/realopl.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/realopl.cpp' object='realopl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o realopl.lo `test -f 'adplug/realopl.cpp' || echo '$(srcdir)/'`adplug/realopl.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o realopl.lo `test -f 'adplug/realopl.cpp' || echo '$(srcdir)/'`adplug/realopl.cpp
 
 rix.lo: adplug/rix.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rix.lo -MD -MP -MF $(DEPDIR)/rix.Tpo -c -o rix.lo `test -f 'adplug/rix.cpp' || echo '$(srcdir)/'`adplug/rix.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/rix.Tpo $(DEPDIR)/rix.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/rix.cpp' object='rix.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rix.lo -MD -MP -MF $(DEPDIR)/rix.Tpo -c -o rix.lo `test -f 'adplug/rix.cpp' || echo '$(srcdir)/'`adplug/rix.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rix.Tpo $(DEPDIR)/rix.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/rix.cpp' object='rix.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rix.lo `test -f 'adplug/rix.cpp' || echo '$(srcdir)/'`adplug/rix.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rix.lo `test -f 'adplug/rix.cpp' || echo '$(srcdir)/'`adplug/rix.cpp
 
 rol.lo: adplug/rol.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rol.lo -MD -MP -MF $(DEPDIR)/rol.Tpo -c -o rol.lo `test -f 'adplug/rol.cpp' || echo '$(srcdir)/'`adplug/rol.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/rol.Tpo $(DEPDIR)/rol.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/rol.cpp' object='rol.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rol.lo -MD -MP -MF $(DEPDIR)/rol.Tpo -c -o rol.lo `test -f 'adplug/rol.cpp' || echo '$(srcdir)/'`adplug/rol.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rol.Tpo $(DEPDIR)/rol.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/rol.cpp' object='rol.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rol.lo `test -f 'adplug/rol.cpp' || echo '$(srcdir)/'`adplug/rol.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rol.lo `test -f 'adplug/rol.cpp' || echo '$(srcdir)/'`adplug/rol.cpp
 
 s3m.lo: adplug/s3m.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT s3m.lo -MD -MP -MF $(DEPDIR)/s3m.Tpo -c -o s3m.lo `test -f 'adplug/s3m.cpp' || echo '$(srcdir)/'`adplug/s3m.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/s3m.Tpo $(DEPDIR)/s3m.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/s3m.cpp' object='s3m.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT s3m.lo -MD -MP -MF $(DEPDIR)/s3m.Tpo -c -o s3m.lo `test -f 'adplug/s3m.cpp' || echo '$(srcdir)/'`adplug/s3m.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/s3m.Tpo $(DEPDIR)/s3m.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/s3m.cpp' object='s3m.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o s3m.lo `test -f 'adplug/s3m.cpp' || echo '$(srcdir)/'`adplug/s3m.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o s3m.lo `test -f 'adplug/s3m.cpp' || echo '$(srcdir)/'`adplug/s3m.cpp
 
 sa2.lo: adplug/sa2.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sa2.lo -MD -MP -MF $(DEPDIR)/sa2.Tpo -c -o sa2.lo `test -f 'adplug/sa2.cpp' || echo '$(srcdir)/'`adplug/sa2.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/sa2.Tpo $(DEPDIR)/sa2.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/sa2.cpp' object='sa2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sa2.lo -MD -MP -MF $(DEPDIR)/sa2.Tpo -c -o sa2.lo `test -f 'adplug/sa2.cpp' || echo '$(srcdir)/'`adplug/sa2.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sa2.Tpo $(DEPDIR)/sa2.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/sa2.cpp' object='sa2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sa2.lo `test -f 'adplug/sa2.cpp' || echo '$(srcdir)/'`adplug/sa2.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sa2.lo `test -f 'adplug/sa2.cpp' || echo '$(srcdir)/'`adplug/sa2.cpp
 
 sng.lo: adplug/sng.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sng.lo -MD -MP -MF $(DEPDIR)/sng.Tpo -c -o sng.lo `test -f 'adplug/sng.cpp' || echo '$(srcdir)/'`adplug/sng.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/sng.Tpo $(DEPDIR)/sng.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/sng.cpp' object='sng.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sng.lo -MD -MP -MF $(DEPDIR)/sng.Tpo -c -o sng.lo `test -f 'adplug/sng.cpp' || echo '$(srcdir)/'`adplug/sng.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sng.Tpo $(DEPDIR)/sng.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/sng.cpp' object='sng.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sng.lo `test -f 'adplug/sng.cpp' || echo '$(srcdir)/'`adplug/sng.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sng.lo `test -f 'adplug/sng.cpp' || echo '$(srcdir)/'`adplug/sng.cpp
 
 surroundopl.lo: adplug/surroundopl.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT surroundopl.lo -MD -MP -MF $(DEPDIR)/surroundopl.Tpo -c -o surroundopl.lo `test -f 'adplug/surroundopl.cpp' || echo '$(srcdir)/'`adplug/surroundopl.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/surroundopl.Tpo $(DEPDIR)/surroundopl.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/surroundopl.cpp' object='surroundopl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT surroundopl.lo -MD -MP -MF $(DEPDIR)/surroundopl.Tpo -c -o surroundopl.lo `test -f 'adplug/surroundopl.cpp' || echo '$(srcdir)/'`adplug/surroundopl.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/surroundopl.Tpo $(DEPDIR)/surroundopl.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/surroundopl.cpp' object='surroundopl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o surroundopl.lo `test -f 'adplug/surroundopl.cpp' || echo '$(srcdir)/'`adplug/surroundopl.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o surroundopl.lo `test -f 'adplug/surroundopl.cpp' || echo '$(srcdir)/'`adplug/surroundopl.cpp
 
 temuopl.lo: adplug/temuopl.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT temuopl.lo -MD -MP -MF $(DEPDIR)/temuopl.Tpo -c -o temuopl.lo `test -f 'adplug/temuopl.cpp' || echo '$(srcdir)/'`adplug/temuopl.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/temuopl.Tpo $(DEPDIR)/temuopl.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/temuopl.cpp' object='temuopl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT temuopl.lo -MD -MP -MF $(DEPDIR)/temuopl.Tpo -c -o temuopl.lo `test -f 'adplug/temuopl.cpp' || echo '$(srcdir)/'`adplug/temuopl.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/temuopl.Tpo $(DEPDIR)/temuopl.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/temuopl.cpp' object='temuopl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o temuopl.lo `test -f 'adplug/temuopl.cpp' || echo '$(srcdir)/'`adplug/temuopl.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o temuopl.lo `test -f 'adplug/temuopl.cpp' || echo '$(srcdir)/'`adplug/temuopl.cpp
 
 u6m.lo: adplug/u6m.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT u6m.lo -MD -MP -MF $(DEPDIR)/u6m.Tpo -c -o u6m.lo `test -f 'adplug/u6m.cpp' || echo '$(srcdir)/'`adplug/u6m.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/u6m.Tpo $(DEPDIR)/u6m.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/u6m.cpp' object='u6m.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT u6m.lo -MD -MP -MF $(DEPDIR)/u6m.Tpo -c -o u6m.lo `test -f 'adplug/u6m.cpp' || echo '$(srcdir)/'`adplug/u6m.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/u6m.Tpo $(DEPDIR)/u6m.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/u6m.cpp' object='u6m.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o u6m.lo `test -f 'adplug/u6m.cpp' || echo '$(srcdir)/'`adplug/u6m.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o u6m.lo `test -f 'adplug/u6m.cpp' || echo '$(srcdir)/'`adplug/u6m.cpp
 
 xad.lo: adplug/xad.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xad.lo -MD -MP -MF $(DEPDIR)/xad.Tpo -c -o xad.lo `test -f 'adplug/xad.cpp' || echo '$(srcdir)/'`adplug/xad.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xad.Tpo $(DEPDIR)/xad.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/xad.cpp' object='xad.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xad.lo -MD -MP -MF $(DEPDIR)/xad.Tpo -c -o xad.lo `test -f 'adplug/xad.cpp' || echo '$(srcdir)/'`adplug/xad.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xad.Tpo $(DEPDIR)/xad.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/xad.cpp' object='xad.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xad.lo `test -f 'adplug/xad.cpp' || echo '$(srcdir)/'`adplug/xad.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xad.lo `test -f 'adplug/xad.cpp' || echo '$(srcdir)/'`adplug/xad.cpp
 
 xsm.lo: adplug/xsm.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xsm.lo -MD -MP -MF $(DEPDIR)/xsm.Tpo -c -o xsm.lo `test -f 'adplug/xsm.cpp' || echo '$(srcdir)/'`adplug/xsm.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsm.Tpo $(DEPDIR)/xsm.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/xsm.cpp' object='xsm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xsm.lo -MD -MP -MF $(DEPDIR)/xsm.Tpo -c -o xsm.lo `test -f 'adplug/xsm.cpp' || echo '$(srcdir)/'`adplug/xsm.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xsm.Tpo $(DEPDIR)/xsm.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='adplug/xsm.cpp' object='xsm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xsm.lo `test -f 'adplug/xsm.cpp' || echo '$(srcdir)/'`adplug/xsm.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xsm.lo `test -f 'adplug/xsm.cpp' || echo '$(srcdir)/'`adplug/xsm.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1151,26 +1247,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1182,15 +1267,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1199,6 +1280,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1343,19 +1439,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 #				   adplug/database.cpp
diff --git a/plugins/adplug/adplug-db.cpp b/plugins/adplug/adplug-db.cpp
index 17f52cc..4561b21 100644
--- a/plugins/adplug/adplug-db.cpp
+++ b/plugins/adplug/adplug-db.cpp
@@ -1,20 +1,24 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    DeaDBeeF ADPLUG plugin
+    Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
 
 #include <stdio.h>
@@ -33,18 +37,6 @@
 //#define trace(...) { fprintf (stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
-int _Unwind_Resume_or_Rethrow;
-int _Unwind_RaiseException;
-int _Unwind_GetLanguageSpecificData;
-int _Unwind_Resume;
-int _Unwind_DeleteException;
-int _Unwind_GetTextRelBase;
-int _Unwind_SetIP;
-int _Unwind_GetDataRelBase;
-int _Unwind_GetRegionStart;
-int _Unwind_SetGR;
-int _Unwind_GetIPInfo;
-
 extern "C" {
 
 extern DB_decoder_t adplug_plugin;
diff --git a/plugins/adplug/plugin.c b/plugins/adplug/plugin.c
index 5ad940a..61143d5 100644
--- a/plugins/adplug/plugin.c
+++ b/plugins/adplug/plugin.c
@@ -1,20 +1,24 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    DeaDBeeF ADPLUG plugin
+    Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
 
 // this is a decoder plugin skeleton
@@ -59,25 +63,46 @@ DB_decoder_t adplug_plugin = {
     .plugin.name = "Adplug player",
     .plugin.descr = "Adplug player (ADLIB OPL2/OPL3 emulator)",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
-        "\n"
-        "Uses modified AdPlug library\n"
-        "Copyright (C) 1999 - 2010 Simon Peter, et al.\n"
-        "http://adplug.sourceforge.net/\n"
-        "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
-        "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
-        "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+    "ADPLUG DeaDBeeF Player Plugin\n"
+    "Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+    "\n"
+    "This software is provided 'as-is', without any express or implied\n"
+    "warranty.  In no event will the authors be held liable for any damages\n"
+    "arising from the use of this software.\n"
+    "\n"
+    "Permission is granted to anyone to use this software for any purpose,\n"
+    "including commercial applications, and to alter it and redistribute it\n"
+    "freely, subject to the following restrictions:\n"
+    "\n"
+    "1. The origin of this software must not be misrepresented; you must not\n"
+    " claim that you wrote the original software. If you use this software\n"
+    " in a product, an acknowledgment in the product documentation would be\n"
+    " appreciated but is not required.\n"
+    "\n"
+    "2. Altered source versions must be plainly marked as such, and must not be\n"
+    " misrepresented as being the original software.\n"
+    "\n"
+    "3. This notice may not be removed or altered from any source distribution.\n"
+    "\n"
+    "\n"
+    "\n"
+    "adplug (modified)\n"
+    "Copyright (C) 1999 - 2006 Simon Peter, <dn.tlp at gmx.net>, et al.\n"
+    "deadbeef-related modifications (c) 2009-2014 Alexey Yakovenko\n"
+    "\n"
+    "This library is free software; you can redistribute it and/or\n"
+    "modify it under the terms of the GNU Lesser General Public\n"
+    "License as published by the Free Software Foundation; either\n"
+    "version 2.1 of the License, or (at your option) any later version.\n"
+    "\n"
+    "This library is distributed in the hope that it will be useful,\n"
+    "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
+    "Lesser General Public License for more details.\n"
+    "\n"
+    "You should have received a copy of the GNU Lesser General Public\n"
+    "License along with this library; if not, write to the Free Software\n"
+    "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .plugin.start = adplug_start,
diff --git a/plugins/alac/COPYING b/plugins/alac/COPYING
new file mode 100644
index 0000000..ed09298
--- /dev/null
+++ b/plugins/alac/COPYING
@@ -0,0 +1,68 @@
+ALAC plugin for deadbeef
+Copyright (C) 2012-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+ALAC (Apple Lossless Audio Codec) decoder
+Copyright (c) 2005 David Hammerton
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+libmp4ff (modified)
+Code from MP4FF is copyright (c) Nero AG, www.nero.com
+deadbeef-related modifications (c) 2009-2014 Alexey Yakovenko
+
+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.
diff --git a/plugins/alac/Makefile.am b/plugins/alac/Makefile.am
index da23099..aace939 100644
--- a/plugins/alac/Makefile.am
+++ b/plugins/alac/Makefile.am
@@ -4,7 +4,7 @@ pkglib_LTLIBRARIES = alac.la
 alac_la_SOURCES = alac_plugin.c\
 alac.c decomp.h demux.c demux.h stream.c stream.h
 
-alac_la_LDFLAGS = -module
+alac_la_LDFLAGS = -module -avoid-version
 
 alac_la_LIBADD = $(LDADD) $(FAAD2_LIBS) ../libmp4ff/libmp4ff.a
 AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING -I at top_srcdir@/plugins/libmp4ff
diff --git a/plugins/alac/Makefile.in b/plugins/alac/Makefile.in
index eb2ab7c..e467475 100644
--- a/plugins/alac/Makefile.in
+++ b/plugins/alac/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/alac
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -117,23 +145,48 @@ am__alac_la_SOURCES_DIST = alac_plugin.c alac.c decomp.h demux.c \
 @HAVE_ALAC_TRUE at am_alac_la_OBJECTS = alac_plugin.lo alac.lo demux.lo \
 @HAVE_ALAC_TRUE@	stream.lo
 alac_la_OBJECTS = $(am_alac_la_OBJECTS)
-alac_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(alac_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+alac_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(alac_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_ALAC_TRUE at am_alac_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(alac_la_SOURCES)
 DIST_SOURCES = $(am__alac_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -141,6 +194,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -167,6 +237,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -187,10 +258,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -213,6 +286,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -266,6 +340,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -284,6 +359,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -309,13 +386,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -324,7 +405,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -387,7 +470,7 @@ top_srcdir = @top_srcdir@
 @HAVE_ALAC_TRUE at alac_la_SOURCES = alac_plugin.c\
 @HAVE_ALAC_TRUE at alac.c decomp.h demux.c demux.h stream.c stream.h
 
- at HAVE_ALAC_TRUE@alac_la_LDFLAGS = -module
+ at HAVE_ALAC_TRUE@alac_la_LDFLAGS = -module -avoid-version
 @HAVE_ALAC_TRUE at alac_la_LIBADD = $(LDADD) $(FAAD2_LIBS) ../libmp4ff/libmp4ff.a
 @HAVE_ALAC_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING -I at top_srcdir@/plugins/libmp4ff
 all: all-am
@@ -424,6 +507,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -450,14 +534,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 alac.la: $(alac_la_OBJECTS) $(alac_la_DEPENDENCIES) $(EXTRA_alac_la_DEPENDENCIES) 
-	$(alac_la_LINK) $(am_alac_la_rpath) $(alac_la_OBJECTS) $(alac_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(alac_la_LINK) $(am_alac_la_rpath) $(alac_la_OBJECTS) $(alac_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -471,25 +558,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/stream.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -497,26 +584,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -528,15 +604,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -545,6 +617,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -689,19 +776,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/alac/alac_plugin.c b/plugins/alac/alac_plugin.c
index 160821f..4291099 100644
--- a/plugins/alac/alac_plugin.c
+++ b/plugins/alac/alac_plugin.c
@@ -357,6 +357,7 @@ static const char *metainfo[] = {
     "copyright", "copyright",
     "totaltracks", "numtracks",
     "tool", "tool",
+    "MusicBrainz Track Id", "musicbrainz_trackid",
     NULL
 };
 
diff --git a/plugins/alsa/COPYING b/plugins/alsa/COPYING
new file mode 100644
index 0000000..8317a4b
--- /dev/null
+++ b/plugins/alsa/COPYING
@@ -0,0 +1,17 @@
+DeaDBeeF ALSA plugin
+Copyright (C) 2009-2014 Alexey Yakovenko et al.
+
+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.
+
diff --git a/plugins/alsa/Makefile.am b/plugins/alsa/Makefile.am
index 265c9b5..d685f29 100644
--- a/plugins/alsa/Makefile.am
+++ b/plugins/alsa/Makefile.am
@@ -2,7 +2,7 @@ if HAVE_ALSA
 alsadir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = alsa.la
 alsa_la_SOURCES = alsa.c
-alsa_la_LDFLAGS = -module
+alsa_la_LDFLAGS = -module -avoid-version
 alsa_la_LIBADD = $(LDADD) $(ALSA_DEPS_LIBS)
 
 AM_CFLAGS = $(CFLAGS) -std=c99 $(ALSA_DEPS_CFLAGS)
diff --git a/plugins/alsa/Makefile.in b/plugins/alsa/Makefile.in
index c6b820e..1723f5b 100644
--- a/plugins/alsa/Makefile.in
+++ b/plugins/alsa/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/alsa
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -114,23 +142,48 @@ am__DEPENDENCIES_1 =
 am__alsa_la_SOURCES_DIST = alsa.c
 @HAVE_ALSA_TRUE at am_alsa_la_OBJECTS = alsa.lo
 alsa_la_OBJECTS = $(am_alsa_la_OBJECTS)
-alsa_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(alsa_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+alsa_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(alsa_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_ALSA_TRUE at am_alsa_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(alsa_la_SOURCES)
 DIST_SOURCES = $(am__alsa_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,6 +191,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,6 +234,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -184,10 +255,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -210,6 +283,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -263,6 +337,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -281,6 +356,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -306,13 +383,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -321,7 +402,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -382,7 +465,7 @@ top_srcdir = @top_srcdir@
 @HAVE_ALSA_TRUE at alsadir = $(libdir)/$(PACKAGE)
 @HAVE_ALSA_TRUE at pkglib_LTLIBRARIES = alsa.la
 @HAVE_ALSA_TRUE at alsa_la_SOURCES = alsa.c
- at HAVE_ALSA_TRUE@alsa_la_LDFLAGS = -module
+ at HAVE_ALSA_TRUE@alsa_la_LDFLAGS = -module -avoid-version
 @HAVE_ALSA_TRUE at alsa_la_LIBADD = $(LDADD) $(ALSA_DEPS_LIBS)
 @HAVE_ALSA_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 $(ALSA_DEPS_CFLAGS)
 all: all-am
@@ -419,6 +502,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -445,14 +529,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 alsa.la: $(alsa_la_OBJECTS) $(alsa_la_DEPENDENCIES) $(EXTRA_alsa_la_DEPENDENCIES) 
-	$(alsa_la_LINK) $(am_alsa_la_rpath) $(alsa_la_OBJECTS) $(alsa_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(alsa_la_LINK) $(am_alsa_la_rpath) $(alsa_la_OBJECTS) $(alsa_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -463,25 +550,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/alsa.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,26 +576,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +596,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +609,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -681,19 +768,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/alsa/alsa.c b/plugins/alsa/alsa.c
index 799dab7..146c776 100644
--- a/plugins/alsa/alsa.c
+++ b/plugins/alsa/alsa.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software: you can redistribute it and/or modify
@@ -431,24 +431,20 @@ palsa_setformat (ddb_waveformat_t *fmt) {
         trace ("palsa_setformat ignored\n");
         return 0;
     }
-#if 0
     else {
         trace ("switching format:\n"
         "bps %d -> %d\n"
         "is_float %d -> %d\n"
-        "is_multichannel %d -> %d\n"
         "channels %d -> %d\n"
         "samplerate %d -> %d\n"
         "channelmask %d -> %d\n"
         , fmt->bps, plugin.fmt.bps
         , fmt->is_float, plugin.fmt.is_float
-        , fmt->is_multichannel, plugin.fmt.is_multichannel
         , fmt->channels, plugin.fmt.channels
         , fmt->samplerate, plugin.fmt.samplerate
         , fmt->channelmask, plugin.fmt.channelmask
         );
     }
-#endif
     LOCK;
     int s = state;
     state = OUTPUT_STATE_STOPPED;
diff --git a/plugins/ao/COPYING b/plugins/ao/COPYING
new file mode 100644
index 0000000..070fb66
--- /dev/null
+++ b/plugins/ao/COPYING
@@ -0,0 +1,255 @@
+AudioOverload DeaDBeeF plugin
+Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+
+
+Here is a list of the licenses each file in this package are under, and their text.
+
+The upshot is this: if you create anything from this SDK and include any MAME licensed components
+(which are an integral part of each engine supplied) you must distribute the source code to your
+derivative program.
+
+
+=====================================================================================
+
+BSD license:
+
+Copyright (c) 2007-2009, R. Belmont and Richard Bannister.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+* Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=====================================================================================
+
+MAME license:
+
+Copyright (c) 1997-2008, Nicola Salmoria and the MAME team
+All rights reserved.
+
+Redistribution and use of this code or any derivative works are permitted provided that the following conditions are met:
+
+    * Redistributions may not be sold, nor may they be used in a commercial product or activity.
+    * Redistributions that are modified from the original source must include the complete source code, including the source code for all components used by a binary built from the modified sources. However, as a special exception, the source code 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.
+    * Redistributions must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=====================================================================================
+
+GPL license:
+
+Too long to include here.
+
+See eng_psf/peops/License.txt or eng_psf/peops2/License.txt for the complete text.
+
+While legally combining GPL with BSD and MAME licensed software is unclear, Pete Bernert 
+will probably be OK with anything you do as long as you distribute the source for your
+AOSDK based creations.
+										  
+=====================================================================================
+
+ZLIB license:
+
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+  version 1.2.2, October 3rd, 2004
+
+  Copyright (C) 1995-2004 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly jloup at gzip.org
+  Mark Adler madler at alumni.caltech.edu
+
+*/
+
+=====================================================================================
+
+List of files and their licenses:
+
+ao.h			BSD
+corlett.c		BSD 
+corlett.h		BSD 
+cpuintrf.h		BSD 
+dsnd.c			BSD 
+eng_protos.h		BSD 
+main.c			BSD 
+Makefile		BSD 
+mem.h			BSD 
+osd_cpu.h		MAME
+oss.c			BSD 
+oss.h			BSD 
+
+eng_dsf:
+
+aica.c			MAME
+aica.h			MAME
+aicadsp.c		MAME
+aicadsp.h		MAME
+aicalfo.c		MAME
+arm7.c			MAME
+arm7.h			MAME
+arm7i.c			MAME
+arm7i.h			MAME
+arm7memil.c		MAME
+eng_dsf.c		BSD
+dc_hw.c			BSD
+dc_hw.h			BSD
+
+eng_qsf:
+
+eng_qsf.c		BSD
+kabuki.c		MAME
+qsound.c		MAME
+qsound.h		MAME
+z80.c			MAME
+z80dasm.c		MAME
+z80dasm.h		MAME
+z80.h			MAME
+
+eng_ssf:
+
+eng_ssf.c		BSD
+m68kconf.h		MAME
+m68kcpu.c		MAME
+m68kcpu.h		MAME
+m68k.h			MAME
+m68k_in.c		MAME
+m68kmake.c		MAME
+m68kmame.h		MAME
+m68kopac.c		MAME
+m68kopdm.c		MAME
+m68kopnz.c		MAME
+m68kops.c		MAME
+m68kops.h		MAME
+sat_hw.c		BSD
+sat_hw.h		BSD
+scsp.c			MAME
+scspdsp.c		MAME
+scspdsp.h		MAME
+scsp.h			MAME
+scsplfo.c		MAME
+
+eng_psf:
+
+eng_psf2.c		BSD
+eng_psf.c		BSD
+eng_spu.c		BSD
+psx_hw.c		BSD
+psx.c			MAME
+psx.h			MAME
+cpuintrf.h		MAME
+mamemem.h		MAME
+
+eng_psf/peops:
+
+adsr.c			GPL
+adsr.h			GPL
+dma.c			GPL
+dma.h			GPL
+externals.h		GPL
+gauss_i.h		GPL
+registers.c		GPL
+registers.h		GPL
+regs.h			GPL
+reverb.c		GPL
+spu.c			GPL
+spu.h			GPL
+stdafx.h		GPL
+
+
+eng_psf/peops2:
+
+adsr.c			GPL
+adsr.h			GPL
+dma.c			GPL
+dma.h			GPL
+externals.h		GPL
+gauss_i.h		GPL
+psemuxa.h		GPL
+registers.c		GPL
+registers.h		GPL
+regs.h			GPL
+reverb.c		GPL
+reverb.h		GPL
+spu.c			GPL
+spu.h			GPL
+stdafx.h		GPL
+xa.c			GPL
+
+
+
+zlib:
+
+adler32.c		ZLIB
+compress.c		ZLIB
+crc32.c			ZLIB
+crc32.h			ZLIB
+crypt.h			ZLIB
+deflate.c		ZLIB
+deflate.h		ZLIB
+gzio.c			ZLIB
+infback.c		ZLIB
+inffast.c		ZLIB
+inffast.h		ZLIB
+inffixed.h		ZLIB
+inflate.c		ZLIB
+inflate.h		ZLIB
+inftrees.c		ZLIB
+inftrees.h		ZLIB
+ioapi.c			ZLIB
+ioapi.h			ZLIB
+trees.c			ZLIB
+trees.h			ZLIB
+uncompr.c		ZLIB
+unzip.c			ZLIB
+unzip.h			ZLIB
+zconf.h			ZLIB
+zlib.h			ZLIB
+zutil.c			ZLIB
+zutil.h			ZLIB
+
diff --git a/plugins/ao/Makefile.am b/plugins/ao/Makefile.am
index b919233..2d124b2 100644
--- a/plugins/ao/Makefile.am
+++ b/plugins/ao/Makefile.am
@@ -17,11 +17,11 @@ eng_psf/cpuintrf.h eng_psf/mamemem.h eng_psf/psx.h\
 eng_psf/peops/adsr.h eng_psf/peops/dma.h eng_psf/peops/externals.h eng_psf/peops/gauss_i.h eng_psf/peops/registers.h eng_psf/peops/regs.h eng_psf/peops/spu.h eng_psf/peops/stdafx.h\
 eng_psf/peops2/adsr.h eng_psf/peops2/dma.h eng_psf/peops2/externals.h eng_psf/peops2/gauss_i.h eng_psf/peops2/psemuxa.h eng_psf/peops2/registers.h eng_psf/peops2/regs.h eng_psf/peops2/reverb.h eng_psf/peops2/spu.h eng_psf/peops2/stdafx.h 
 
-ddb_ao_la_LDFLAGS = -module $(ZLIB_LIBS)
+ddb_ao_la_LDFLAGS = -module -avoid-version $(ZLIB_LIBS)
 
 EXTRA_DIST=eng_psf/peops/reverb.c eng_psf/peops/adsr.c eng_psf/peops/registers.c eng_psf/peops/dma.c eng_psf/peops2/spu2.c eng_psf/peops2/reverb2.c eng_psf/peops2/adsr2.c eng_dsf/arm7memil.c eng_dsf/aicalfo.c eng_ssf/scsplfo.c
 
 ddb_ao_la_LIBADD = $(LDADD)
-AM_CFLAGS = $(CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm -fPIC 
+AM_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm -fPIC 
 endif
 
diff --git a/plugins/ao/Makefile.in b/plugins/ao/Makefile.in
index 44d8a25..b200d67 100644
--- a/plugins/ao/Makefile.in
+++ b/plugins/ao/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/ao
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -146,23 +174,48 @@ am__ddb_ao_la_SOURCES_DIST = plugin.c main.c corlett.c \
 @HAVE_PSF_TRUE@	psx_hw.lo spu.lo eng_psf2.lo spu2.lo dma2.lo \
 @HAVE_PSF_TRUE@	registers2.lo eng_spu.lo
 ddb_ao_la_OBJECTS = $(am_ddb_ao_la_OBJECTS)
-ddb_ao_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+ddb_ao_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(ddb_ao_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_PSF_TRUE at am_ddb_ao_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(ddb_ao_la_SOURCES)
 DIST_SOURCES = $(am__ddb_ao_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -170,6 +223,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -196,6 +266,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -216,10 +287,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -242,6 +315,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -295,6 +369,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -313,6 +388,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -338,13 +415,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -353,7 +434,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -429,10 +512,10 @@ top_srcdir = @top_srcdir@
 @HAVE_PSF_TRUE at eng_psf/peops/adsr.h eng_psf/peops/dma.h eng_psf/peops/externals.h eng_psf/peops/gauss_i.h eng_psf/peops/registers.h eng_psf/peops/regs.h eng_psf/peops/spu.h eng_psf/peops/stdafx.h\
 @HAVE_PSF_TRUE at eng_psf/peops2/adsr.h eng_psf/peops2/dma.h eng_psf/peops2/externals.h eng_psf/peops2/gauss_i.h eng_psf/peops2/psemuxa.h eng_psf/peops2/registers.h eng_psf/peops2/regs.h eng_psf/peops2/reverb.h eng_psf/peops2/spu.h eng_psf/peops2/stdafx.h 
 
- at HAVE_PSF_TRUE@ddb_ao_la_LDFLAGS = -module $(ZLIB_LIBS)
+ at HAVE_PSF_TRUE@ddb_ao_la_LDFLAGS = -module -avoid-version $(ZLIB_LIBS)
 @HAVE_PSF_TRUE at EXTRA_DIST = eng_psf/peops/reverb.c eng_psf/peops/adsr.c eng_psf/peops/registers.c eng_psf/peops/dma.c eng_psf/peops2/spu2.c eng_psf/peops2/reverb2.c eng_psf/peops2/adsr2.c eng_dsf/arm7memil.c eng_dsf/aicalfo.c eng_ssf/scsplfo.c
 @HAVE_PSF_TRUE at ddb_ao_la_LIBADD = $(LDADD)
- at HAVE_PSF_TRUE@AM_CFLAGS = $(CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm -fPIC 
+ at HAVE_PSF_TRUE@AM_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm -fPIC 
 all: all-am
 
 .SUFFIXES:
@@ -467,6 +550,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -493,14 +577,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 ddb_ao.la: $(ddb_ao_la_OBJECTS) $(ddb_ao_la_DEPENDENCIES) $(EXTRA_ddb_ao_la_DEPENDENCIES) 
-	$(ddb_ao_la_LINK) $(am_ddb_ao_la_rpath) $(ddb_ao_la_OBJECTS) $(ddb_ao_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(ddb_ao_la_LINK) $(am_ddb_ao_la_rpath) $(ddb_ao_la_OBJECTS) $(ddb_ao_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -542,228 +629,228 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/z80dasm.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 eng_dsf.lo: eng_dsf/eng_dsf.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_dsf.lo -MD -MP -MF $(DEPDIR)/eng_dsf.Tpo -c -o eng_dsf.lo `test -f 'eng_dsf/eng_dsf.c' || echo '$(srcdir)/'`eng_dsf/eng_dsf.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eng_dsf.Tpo $(DEPDIR)/eng_dsf.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_dsf/eng_dsf.c' object='eng_dsf.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_dsf.lo -MD -MP -MF $(DEPDIR)/eng_dsf.Tpo -c -o eng_dsf.lo `test -f 'eng_dsf/eng_dsf.c' || echo '$(srcdir)/'`eng_dsf/eng_dsf.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/eng_dsf.Tpo $(DEPDIR)/eng_dsf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_dsf/eng_dsf.c' object='eng_dsf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_dsf.lo `test -f 'eng_dsf/eng_dsf.c' || echo '$(srcdir)/'`eng_dsf/eng_dsf.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_dsf.lo `test -f 'eng_dsf/eng_dsf.c' || echo '$(srcdir)/'`eng_dsf/eng_dsf.c
 
 dc_hw.lo: eng_dsf/dc_hw.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dc_hw.lo -MD -MP -MF $(DEPDIR)/dc_hw.Tpo -c -o dc_hw.lo `test -f 'eng_dsf/dc_hw.c' || echo '$(srcdir)/'`eng_dsf/dc_hw.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dc_hw.Tpo $(DEPDIR)/dc_hw.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_dsf/dc_hw.c' object='dc_hw.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dc_hw.lo -MD -MP -MF $(DEPDIR)/dc_hw.Tpo -c -o dc_hw.lo `test -f 'eng_dsf/dc_hw.c' || echo '$(srcdir)/'`eng_dsf/dc_hw.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dc_hw.Tpo $(DEPDIR)/dc_hw.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_dsf/dc_hw.c' object='dc_hw.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dc_hw.lo `test -f 'eng_dsf/dc_hw.c' || echo '$(srcdir)/'`eng_dsf/dc_hw.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dc_hw.lo `test -f 'eng_dsf/dc_hw.c' || echo '$(srcdir)/'`eng_dsf/dc_hw.c
 
 aica.lo: eng_dsf/aica.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aica.lo -MD -MP -MF $(DEPDIR)/aica.Tpo -c -o aica.lo `test -f 'eng_dsf/aica.c' || echo '$(srcdir)/'`eng_dsf/aica.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/aica.Tpo $(DEPDIR)/aica.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_dsf/aica.c' object='aica.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aica.lo -MD -MP -MF $(DEPDIR)/aica.Tpo -c -o aica.lo `test -f 'eng_dsf/aica.c' || echo '$(srcdir)/'`eng_dsf/aica.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/aica.Tpo $(DEPDIR)/aica.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_dsf/aica.c' object='aica.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aica.lo `test -f 'eng_dsf/aica.c' || echo '$(srcdir)/'`eng_dsf/aica.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aica.lo `test -f 'eng_dsf/aica.c' || echo '$(srcdir)/'`eng_dsf/aica.c
 
 aicadsp.lo: eng_dsf/aicadsp.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aicadsp.lo -MD -MP -MF $(DEPDIR)/aicadsp.Tpo -c -o aicadsp.lo `test -f 'eng_dsf/aicadsp.c' || echo '$(srcdir)/'`eng_dsf/aicadsp.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/aicadsp.Tpo $(DEPDIR)/aicadsp.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_dsf/aicadsp.c' object='aicadsp.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aicadsp.lo -MD -MP -MF $(DEPDIR)/aicadsp.Tpo -c -o aicadsp.lo `test -f 'eng_dsf/aicadsp.c' || echo '$(srcdir)/'`eng_dsf/aicadsp.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/aicadsp.Tpo $(DEPDIR)/aicadsp.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_dsf/aicadsp.c' object='aicadsp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aicadsp.lo `test -f 'eng_dsf/aicadsp.c' || echo '$(srcdir)/'`eng_dsf/aicadsp.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aicadsp.lo `test -f 'eng_dsf/aicadsp.c' || echo '$(srcdir)/'`eng_dsf/aicadsp.c
 
 arm7.lo: eng_dsf/arm7.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT arm7.lo -MD -MP -MF $(DEPDIR)/arm7.Tpo -c -o arm7.lo `test -f 'eng_dsf/arm7.c' || echo '$(srcdir)/'`eng_dsf/arm7.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/arm7.Tpo $(DEPDIR)/arm7.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_dsf/arm7.c' object='arm7.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT arm7.lo -MD -MP -MF $(DEPDIR)/arm7.Tpo -c -o arm7.lo `test -f 'eng_dsf/arm7.c' || echo '$(srcdir)/'`eng_dsf/arm7.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/arm7.Tpo $(DEPDIR)/arm7.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_dsf/arm7.c' object='arm7.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o arm7.lo `test -f 'eng_dsf/arm7.c' || echo '$(srcdir)/'`eng_dsf/arm7.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o arm7.lo `test -f 'eng_dsf/arm7.c' || echo '$(srcdir)/'`eng_dsf/arm7.c
 
 arm7i.lo: eng_dsf/arm7i.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT arm7i.lo -MD -MP -MF $(DEPDIR)/arm7i.Tpo -c -o arm7i.lo `test -f 'eng_dsf/arm7i.c' || echo '$(srcdir)/'`eng_dsf/arm7i.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/arm7i.Tpo $(DEPDIR)/arm7i.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_dsf/arm7i.c' object='arm7i.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT arm7i.lo -MD -MP -MF $(DEPDIR)/arm7i.Tpo -c -o arm7i.lo `test -f 'eng_dsf/arm7i.c' || echo '$(srcdir)/'`eng_dsf/arm7i.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/arm7i.Tpo $(DEPDIR)/arm7i.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_dsf/arm7i.c' object='arm7i.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o arm7i.lo `test -f 'eng_dsf/arm7i.c' || echo '$(srcdir)/'`eng_dsf/arm7i.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o arm7i.lo `test -f 'eng_dsf/arm7i.c' || echo '$(srcdir)/'`eng_dsf/arm7i.c
 
 m68kcpu.lo: eng_ssf/m68kcpu.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kcpu.lo -MD -MP -MF $(DEPDIR)/m68kcpu.Tpo -c -o m68kcpu.lo `test -f 'eng_ssf/m68kcpu.c' || echo '$(srcdir)/'`eng_ssf/m68kcpu.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/m68kcpu.Tpo $(DEPDIR)/m68kcpu.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/m68kcpu.c' object='m68kcpu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kcpu.lo -MD -MP -MF $(DEPDIR)/m68kcpu.Tpo -c -o m68kcpu.lo `test -f 'eng_ssf/m68kcpu.c' || echo '$(srcdir)/'`eng_ssf/m68kcpu.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/m68kcpu.Tpo $(DEPDIR)/m68kcpu.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/m68kcpu.c' object='m68kcpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kcpu.lo `test -f 'eng_ssf/m68kcpu.c' || echo '$(srcdir)/'`eng_ssf/m68kcpu.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kcpu.lo `test -f 'eng_ssf/m68kcpu.c' || echo '$(srcdir)/'`eng_ssf/m68kcpu.c
 
 m68kopac.lo: eng_ssf/m68kopac.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kopac.lo -MD -MP -MF $(DEPDIR)/m68kopac.Tpo -c -o m68kopac.lo `test -f 'eng_ssf/m68kopac.c' || echo '$(srcdir)/'`eng_ssf/m68kopac.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/m68kopac.Tpo $(DEPDIR)/m68kopac.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/m68kopac.c' object='m68kopac.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kopac.lo -MD -MP -MF $(DEPDIR)/m68kopac.Tpo -c -o m68kopac.lo `test -f 'eng_ssf/m68kopac.c' || echo '$(srcdir)/'`eng_ssf/m68kopac.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/m68kopac.Tpo $(DEPDIR)/m68kopac.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/m68kopac.c' object='m68kopac.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kopac.lo `test -f 'eng_ssf/m68kopac.c' || echo '$(srcdir)/'`eng_ssf/m68kopac.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kopac.lo `test -f 'eng_ssf/m68kopac.c' || echo '$(srcdir)/'`eng_ssf/m68kopac.c
 
 m68kopdm.lo: eng_ssf/m68kopdm.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kopdm.lo -MD -MP -MF $(DEPDIR)/m68kopdm.Tpo -c -o m68kopdm.lo `test -f 'eng_ssf/m68kopdm.c' || echo '$(srcdir)/'`eng_ssf/m68kopdm.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/m68kopdm.Tpo $(DEPDIR)/m68kopdm.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/m68kopdm.c' object='m68kopdm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kopdm.lo -MD -MP -MF $(DEPDIR)/m68kopdm.Tpo -c -o m68kopdm.lo `test -f 'eng_ssf/m68kopdm.c' || echo '$(srcdir)/'`eng_ssf/m68kopdm.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/m68kopdm.Tpo $(DEPDIR)/m68kopdm.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/m68kopdm.c' object='m68kopdm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kopdm.lo `test -f 'eng_ssf/m68kopdm.c' || echo '$(srcdir)/'`eng_ssf/m68kopdm.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kopdm.lo `test -f 'eng_ssf/m68kopdm.c' || echo '$(srcdir)/'`eng_ssf/m68kopdm.c
 
 m68kopnz.lo: eng_ssf/m68kopnz.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kopnz.lo -MD -MP -MF $(DEPDIR)/m68kopnz.Tpo -c -o m68kopnz.lo `test -f 'eng_ssf/m68kopnz.c' || echo '$(srcdir)/'`eng_ssf/m68kopnz.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/m68kopnz.Tpo $(DEPDIR)/m68kopnz.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/m68kopnz.c' object='m68kopnz.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kopnz.lo -MD -MP -MF $(DEPDIR)/m68kopnz.Tpo -c -o m68kopnz.lo `test -f 'eng_ssf/m68kopnz.c' || echo '$(srcdir)/'`eng_ssf/m68kopnz.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/m68kopnz.Tpo $(DEPDIR)/m68kopnz.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/m68kopnz.c' object='m68kopnz.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kopnz.lo `test -f 'eng_ssf/m68kopnz.c' || echo '$(srcdir)/'`eng_ssf/m68kopnz.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kopnz.lo `test -f 'eng_ssf/m68kopnz.c' || echo '$(srcdir)/'`eng_ssf/m68kopnz.c
 
 m68kops.lo: eng_ssf/m68kops.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kops.lo -MD -MP -MF $(DEPDIR)/m68kops.Tpo -c -o m68kops.lo `test -f 'eng_ssf/m68kops.c' || echo '$(srcdir)/'`eng_ssf/m68kops.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/m68kops.Tpo $(DEPDIR)/m68kops.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/m68kops.c' object='m68kops.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kops.lo -MD -MP -MF $(DEPDIR)/m68kops.Tpo -c -o m68kops.lo `test -f 'eng_ssf/m68kops.c' || echo '$(srcdir)/'`eng_ssf/m68kops.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/m68kops.Tpo $(DEPDIR)/m68kops.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/m68kops.c' object='m68kops.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kops.lo `test -f 'eng_ssf/m68kops.c' || echo '$(srcdir)/'`eng_ssf/m68kops.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kops.lo `test -f 'eng_ssf/m68kops.c' || echo '$(srcdir)/'`eng_ssf/m68kops.c
 
 scsp.lo: eng_ssf/scsp.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT scsp.lo -MD -MP -MF $(DEPDIR)/scsp.Tpo -c -o scsp.lo `test -f 'eng_ssf/scsp.c' || echo '$(srcdir)/'`eng_ssf/scsp.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/scsp.Tpo $(DEPDIR)/scsp.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/scsp.c' object='scsp.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT scsp.lo -MD -MP -MF $(DEPDIR)/scsp.Tpo -c -o scsp.lo `test -f 'eng_ssf/scsp.c' || echo '$(srcdir)/'`eng_ssf/scsp.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/scsp.Tpo $(DEPDIR)/scsp.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/scsp.c' object='scsp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scsp.lo `test -f 'eng_ssf/scsp.c' || echo '$(srcdir)/'`eng_ssf/scsp.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scsp.lo `test -f 'eng_ssf/scsp.c' || echo '$(srcdir)/'`eng_ssf/scsp.c
 
 scspdsp.lo: eng_ssf/scspdsp.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT scspdsp.lo -MD -MP -MF $(DEPDIR)/scspdsp.Tpo -c -o scspdsp.lo `test -f 'eng_ssf/scspdsp.c' || echo '$(srcdir)/'`eng_ssf/scspdsp.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/scspdsp.Tpo $(DEPDIR)/scspdsp.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/scspdsp.c' object='scspdsp.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT scspdsp.lo -MD -MP -MF $(DEPDIR)/scspdsp.Tpo -c -o scspdsp.lo `test -f 'eng_ssf/scspdsp.c' || echo '$(srcdir)/'`eng_ssf/scspdsp.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/scspdsp.Tpo $(DEPDIR)/scspdsp.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/scspdsp.c' object='scspdsp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scspdsp.lo `test -f 'eng_ssf/scspdsp.c' || echo '$(srcdir)/'`eng_ssf/scspdsp.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scspdsp.lo `test -f 'eng_ssf/scspdsp.c' || echo '$(srcdir)/'`eng_ssf/scspdsp.c
 
 sat_hw.lo: eng_ssf/sat_hw.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sat_hw.lo -MD -MP -MF $(DEPDIR)/sat_hw.Tpo -c -o sat_hw.lo `test -f 'eng_ssf/sat_hw.c' || echo '$(srcdir)/'`eng_ssf/sat_hw.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/sat_hw.Tpo $(DEPDIR)/sat_hw.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/sat_hw.c' object='sat_hw.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sat_hw.lo -MD -MP -MF $(DEPDIR)/sat_hw.Tpo -c -o sat_hw.lo `test -f 'eng_ssf/sat_hw.c' || echo '$(srcdir)/'`eng_ssf/sat_hw.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sat_hw.Tpo $(DEPDIR)/sat_hw.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/sat_hw.c' object='sat_hw.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sat_hw.lo `test -f 'eng_ssf/sat_hw.c' || echo '$(srcdir)/'`eng_ssf/sat_hw.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sat_hw.lo `test -f 'eng_ssf/sat_hw.c' || echo '$(srcdir)/'`eng_ssf/sat_hw.c
 
 eng_ssf.lo: eng_ssf/eng_ssf.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_ssf.lo -MD -MP -MF $(DEPDIR)/eng_ssf.Tpo -c -o eng_ssf.lo `test -f 'eng_ssf/eng_ssf.c' || echo '$(srcdir)/'`eng_ssf/eng_ssf.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eng_ssf.Tpo $(DEPDIR)/eng_ssf.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/eng_ssf.c' object='eng_ssf.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_ssf.lo -MD -MP -MF $(DEPDIR)/eng_ssf.Tpo -c -o eng_ssf.lo `test -f 'eng_ssf/eng_ssf.c' || echo '$(srcdir)/'`eng_ssf/eng_ssf.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/eng_ssf.Tpo $(DEPDIR)/eng_ssf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/eng_ssf.c' object='eng_ssf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_ssf.lo `test -f 'eng_ssf/eng_ssf.c' || echo '$(srcdir)/'`eng_ssf/eng_ssf.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_ssf.lo `test -f 'eng_ssf/eng_ssf.c' || echo '$(srcdir)/'`eng_ssf/eng_ssf.c
 
 eng_qsf.lo: eng_qsf/eng_qsf.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_qsf.lo -MD -MP -MF $(DEPDIR)/eng_qsf.Tpo -c -o eng_qsf.lo `test -f 'eng_qsf/eng_qsf.c' || echo '$(srcdir)/'`eng_qsf/eng_qsf.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eng_qsf.Tpo $(DEPDIR)/eng_qsf.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_qsf/eng_qsf.c' object='eng_qsf.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_qsf.lo -MD -MP -MF $(DEPDIR)/eng_qsf.Tpo -c -o eng_qsf.lo `test -f 'eng_qsf/eng_qsf.c' || echo '$(srcdir)/'`eng_qsf/eng_qsf.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/eng_qsf.Tpo $(DEPDIR)/eng_qsf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_qsf/eng_qsf.c' object='eng_qsf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_qsf.lo `test -f 'eng_qsf/eng_qsf.c' || echo '$(srcdir)/'`eng_qsf/eng_qsf.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_qsf.lo `test -f 'eng_qsf/eng_qsf.c' || echo '$(srcdir)/'`eng_qsf/eng_qsf.c
 
 kabuki.lo: eng_qsf/kabuki.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT kabuki.lo -MD -MP -MF $(DEPDIR)/kabuki.Tpo -c -o kabuki.lo `test -f 'eng_qsf/kabuki.c' || echo '$(srcdir)/'`eng_qsf/kabuki.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/kabuki.Tpo $(DEPDIR)/kabuki.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_qsf/kabuki.c' object='kabuki.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT kabuki.lo -MD -MP -MF $(DEPDIR)/kabuki.Tpo -c -o kabuki.lo `test -f 'eng_qsf/kabuki.c' || echo '$(srcdir)/'`eng_qsf/kabuki.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/kabuki.Tpo $(DEPDIR)/kabuki.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_qsf/kabuki.c' object='kabuki.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o kabuki.lo `test -f 'eng_qsf/kabuki.c' || echo '$(srcdir)/'`eng_qsf/kabuki.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o kabuki.lo `test -f 'eng_qsf/kabuki.c' || echo '$(srcdir)/'`eng_qsf/kabuki.c
 
 qsound.lo: eng_qsf/qsound.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT qsound.lo -MD -MP -MF $(DEPDIR)/qsound.Tpo -c -o qsound.lo `test -f 'eng_qsf/qsound.c' || echo '$(srcdir)/'`eng_qsf/qsound.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/qsound.Tpo $(DEPDIR)/qsound.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_qsf/qsound.c' object='qsound.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT qsound.lo -MD -MP -MF $(DEPDIR)/qsound.Tpo -c -o qsound.lo `test -f 'eng_qsf/qsound.c' || echo '$(srcdir)/'`eng_qsf/qsound.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/qsound.Tpo $(DEPDIR)/qsound.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_qsf/qsound.c' object='qsound.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o qsound.lo `test -f 'eng_qsf/qsound.c' || echo '$(srcdir)/'`eng_qsf/qsound.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o qsound.lo `test -f 'eng_qsf/qsound.c' || echo '$(srcdir)/'`eng_qsf/qsound.c
 
 z80.lo: eng_qsf/z80.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT z80.lo -MD -MP -MF $(DEPDIR)/z80.Tpo -c -o z80.lo `test -f 'eng_qsf/z80.c' || echo '$(srcdir)/'`eng_qsf/z80.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/z80.Tpo $(DEPDIR)/z80.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_qsf/z80.c' object='z80.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT z80.lo -MD -MP -MF $(DEPDIR)/z80.Tpo -c -o z80.lo `test -f 'eng_qsf/z80.c' || echo '$(srcdir)/'`eng_qsf/z80.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/z80.Tpo $(DEPDIR)/z80.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_qsf/z80.c' object='z80.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o z80.lo `test -f 'eng_qsf/z80.c' || echo '$(srcdir)/'`eng_qsf/z80.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o z80.lo `test -f 'eng_qsf/z80.c' || echo '$(srcdir)/'`eng_qsf/z80.c
 
 z80dasm.lo: eng_qsf/z80dasm.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT z80dasm.lo -MD -MP -MF $(DEPDIR)/z80dasm.Tpo -c -o z80dasm.lo `test -f 'eng_qsf/z80dasm.c' || echo '$(srcdir)/'`eng_qsf/z80dasm.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/z80dasm.Tpo $(DEPDIR)/z80dasm.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_qsf/z80dasm.c' object='z80dasm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT z80dasm.lo -MD -MP -MF $(DEPDIR)/z80dasm.Tpo -c -o z80dasm.lo `test -f 'eng_qsf/z80dasm.c' || echo '$(srcdir)/'`eng_qsf/z80dasm.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/z80dasm.Tpo $(DEPDIR)/z80dasm.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_qsf/z80dasm.c' object='z80dasm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o z80dasm.lo `test -f 'eng_qsf/z80dasm.c' || echo '$(srcdir)/'`eng_qsf/z80dasm.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o z80dasm.lo `test -f 'eng_qsf/z80dasm.c' || echo '$(srcdir)/'`eng_qsf/z80dasm.c
 
 eng_psf.lo: eng_psf/eng_psf.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_psf.lo -MD -MP -MF $(DEPDIR)/eng_psf.Tpo -c -o eng_psf.lo `test -f 'eng_psf/eng_psf.c' || echo '$(srcdir)/'`eng_psf/eng_psf.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eng_psf.Tpo $(DEPDIR)/eng_psf.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/eng_psf.c' object='eng_psf.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_psf.lo -MD -MP -MF $(DEPDIR)/eng_psf.Tpo -c -o eng_psf.lo `test -f 'eng_psf/eng_psf.c' || echo '$(srcdir)/'`eng_psf/eng_psf.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/eng_psf.Tpo $(DEPDIR)/eng_psf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_psf/eng_psf.c' object='eng_psf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_psf.lo `test -f 'eng_psf/eng_psf.c' || echo '$(srcdir)/'`eng_psf/eng_psf.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_psf.lo `test -f 'eng_psf/eng_psf.c' || echo '$(srcdir)/'`eng_psf/eng_psf.c
 
 psx.lo: eng_psf/psx.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psx.lo -MD -MP -MF $(DEPDIR)/psx.Tpo -c -o psx.lo `test -f 'eng_psf/psx.c' || echo '$(srcdir)/'`eng_psf/psx.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psx.Tpo $(DEPDIR)/psx.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/psx.c' object='psx.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psx.lo -MD -MP -MF $(DEPDIR)/psx.Tpo -c -o psx.lo `test -f 'eng_psf/psx.c' || echo '$(srcdir)/'`eng_psf/psx.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/psx.Tpo $(DEPDIR)/psx.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_psf/psx.c' object='psx.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psx.lo `test -f 'eng_psf/psx.c' || echo '$(srcdir)/'`eng_psf/psx.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psx.lo `test -f 'eng_psf/psx.c' || echo '$(srcdir)/'`eng_psf/psx.c
 
 psx_hw.lo: eng_psf/psx_hw.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psx_hw.lo -MD -MP -MF $(DEPDIR)/psx_hw.Tpo -c -o psx_hw.lo `test -f 'eng_psf/psx_hw.c' || echo '$(srcdir)/'`eng_psf/psx_hw.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psx_hw.Tpo $(DEPDIR)/psx_hw.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/psx_hw.c' object='psx_hw.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psx_hw.lo -MD -MP -MF $(DEPDIR)/psx_hw.Tpo -c -o psx_hw.lo `test -f 'eng_psf/psx_hw.c' || echo '$(srcdir)/'`eng_psf/psx_hw.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/psx_hw.Tpo $(DEPDIR)/psx_hw.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_psf/psx_hw.c' object='psx_hw.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psx_hw.lo `test -f 'eng_psf/psx_hw.c' || echo '$(srcdir)/'`eng_psf/psx_hw.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psx_hw.lo `test -f 'eng_psf/psx_hw.c' || echo '$(srcdir)/'`eng_psf/psx_hw.c
 
 spu.lo: eng_psf/peops/spu.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu.lo -MD -MP -MF $(DEPDIR)/spu.Tpo -c -o spu.lo `test -f 'eng_psf/peops/spu.c' || echo '$(srcdir)/'`eng_psf/peops/spu.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/spu.Tpo $(DEPDIR)/spu.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/peops/spu.c' object='spu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu.lo -MD -MP -MF $(DEPDIR)/spu.Tpo -c -o spu.lo `test -f 'eng_psf/peops/spu.c' || echo '$(srcdir)/'`eng_psf/peops/spu.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/spu.Tpo $(DEPDIR)/spu.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_psf/peops/spu.c' object='spu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu.lo `test -f 'eng_psf/peops/spu.c' || echo '$(srcdir)/'`eng_psf/peops/spu.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu.lo `test -f 'eng_psf/peops/spu.c' || echo '$(srcdir)/'`eng_psf/peops/spu.c
 
 eng_psf2.lo: eng_psf/eng_psf2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_psf2.lo -MD -MP -MF $(DEPDIR)/eng_psf2.Tpo -c -o eng_psf2.lo `test -f 'eng_psf/eng_psf2.c' || echo '$(srcdir)/'`eng_psf/eng_psf2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eng_psf2.Tpo $(DEPDIR)/eng_psf2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/eng_psf2.c' object='eng_psf2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_psf2.lo -MD -MP -MF $(DEPDIR)/eng_psf2.Tpo -c -o eng_psf2.lo `test -f 'eng_psf/eng_psf2.c' || echo '$(srcdir)/'`eng_psf/eng_psf2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/eng_psf2.Tpo $(DEPDIR)/eng_psf2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_psf/eng_psf2.c' object='eng_psf2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_psf2.lo `test -f 'eng_psf/eng_psf2.c' || echo '$(srcdir)/'`eng_psf/eng_psf2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_psf2.lo `test -f 'eng_psf/eng_psf2.c' || echo '$(srcdir)/'`eng_psf/eng_psf2.c
 
 spu2.lo: eng_psf/peops2/spu2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu2.lo -MD -MP -MF $(DEPDIR)/spu2.Tpo -c -o spu2.lo `test -f 'eng_psf/peops2/spu2.c' || echo '$(srcdir)/'`eng_psf/peops2/spu2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/spu2.Tpo $(DEPDIR)/spu2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/peops2/spu2.c' object='spu2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu2.lo -MD -MP -MF $(DEPDIR)/spu2.Tpo -c -o spu2.lo `test -f 'eng_psf/peops2/spu2.c' || echo '$(srcdir)/'`eng_psf/peops2/spu2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/spu2.Tpo $(DEPDIR)/spu2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_psf/peops2/spu2.c' object='spu2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu2.lo `test -f 'eng_psf/peops2/spu2.c' || echo '$(srcdir)/'`eng_psf/peops2/spu2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu2.lo `test -f 'eng_psf/peops2/spu2.c' || echo '$(srcdir)/'`eng_psf/peops2/spu2.c
 
 dma2.lo: eng_psf/peops2/dma2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dma2.lo -MD -MP -MF $(DEPDIR)/dma2.Tpo -c -o dma2.lo `test -f 'eng_psf/peops2/dma2.c' || echo '$(srcdir)/'`eng_psf/peops2/dma2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dma2.Tpo $(DEPDIR)/dma2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/peops2/dma2.c' object='dma2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dma2.lo -MD -MP -MF $(DEPDIR)/dma2.Tpo -c -o dma2.lo `test -f 'eng_psf/peops2/dma2.c' || echo '$(srcdir)/'`eng_psf/peops2/dma2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dma2.Tpo $(DEPDIR)/dma2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_psf/peops2/dma2.c' object='dma2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dma2.lo `test -f 'eng_psf/peops2/dma2.c' || echo '$(srcdir)/'`eng_psf/peops2/dma2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dma2.lo `test -f 'eng_psf/peops2/dma2.c' || echo '$(srcdir)/'`eng_psf/peops2/dma2.c
 
 registers2.lo: eng_psf/peops2/registers2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT registers2.lo -MD -MP -MF $(DEPDIR)/registers2.Tpo -c -o registers2.lo `test -f 'eng_psf/peops2/registers2.c' || echo '$(srcdir)/'`eng_psf/peops2/registers2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/registers2.Tpo $(DEPDIR)/registers2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/peops2/registers2.c' object='registers2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT registers2.lo -MD -MP -MF $(DEPDIR)/registers2.Tpo -c -o registers2.lo `test -f 'eng_psf/peops2/registers2.c' || echo '$(srcdir)/'`eng_psf/peops2/registers2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/registers2.Tpo $(DEPDIR)/registers2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_psf/peops2/registers2.c' object='registers2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o registers2.lo `test -f 'eng_psf/peops2/registers2.c' || echo '$(srcdir)/'`eng_psf/peops2/registers2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o registers2.lo `test -f 'eng_psf/peops2/registers2.c' || echo '$(srcdir)/'`eng_psf/peops2/registers2.c
 
 eng_spu.lo: eng_psf/eng_spu.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_spu.lo -MD -MP -MF $(DEPDIR)/eng_spu.Tpo -c -o eng_spu.lo `test -f 'eng_psf/eng_spu.c' || echo '$(srcdir)/'`eng_psf/eng_spu.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eng_spu.Tpo $(DEPDIR)/eng_spu.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/eng_spu.c' object='eng_spu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_spu.lo -MD -MP -MF $(DEPDIR)/eng_spu.Tpo -c -o eng_spu.lo `test -f 'eng_psf/eng_spu.c' || echo '$(srcdir)/'`eng_psf/eng_spu.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/eng_spu.Tpo $(DEPDIR)/eng_spu.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_psf/eng_spu.c' object='eng_spu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_spu.lo `test -f 'eng_psf/eng_spu.c' || echo '$(srcdir)/'`eng_psf/eng_spu.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_spu.lo `test -f 'eng_psf/eng_spu.c' || echo '$(srcdir)/'`eng_psf/eng_spu.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -771,26 +858,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -802,15 +878,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -819,6 +891,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -963,19 +1050,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/ao/ao.h b/plugins/ao/ao.h
old mode 100755
new mode 100644
diff --git a/plugins/ao/eng_dsf/aica.c b/plugins/ao/eng_dsf/aica.c
index f504d64..0283169 100644
--- a/plugins/ao/eng_dsf/aica.c
+++ b/plugins/ao/eng_dsf/aica.c
@@ -402,7 +402,7 @@ void InitADPCM(int *PrevSignal, int *PrevQuant)
 	*PrevQuant=0x7f;
 }
 
-INLINE signed short DecodeADPCM(int *PrevSignal, unsigned char Delta, int *PrevQuant)
+static INLINE signed short DecodeADPCM(int *PrevSignal, unsigned char Delta, int *PrevQuant)
 {
 	int x = *PrevQuant * quant_mul [Delta & 15];
         x = *PrevSignal + ((int)(x + ((UINT32)x >> 29)) >> 3);
@@ -957,7 +957,7 @@ void AICA_TimersAddTicks(struct _AICA *AICA, int ticks)
 	}
 }
 
-INLINE INT32 AICA_UpdateSlot(struct _AICA *AICA, struct _SLOT *slot)
+static INLINE INT32 AICA_UpdateSlot(struct _AICA *AICA, struct _SLOT *slot)
 {
 	INT32 sample, fpart;
 	int cur_sample;       //current sample
diff --git a/plugins/ao/eng_dsf/aicalfo.c b/plugins/ao/eng_dsf/aicalfo.c
index 9af2ae5..cc1ea1c 100644
--- a/plugins/ao/eng_dsf/aicalfo.c
+++ b/plugins/ao/eng_dsf/aicalfo.c
@@ -103,7 +103,7 @@ void AICALFO_Init(void)
 	}
 }
 
-signed int INLINE AICAPLFO_Step(struct _LFO *LFO)
+static signed int INLINE AICAPLFO_Step(struct _LFO *LFO)
 {
 	int p;
 
@@ -116,7 +116,7 @@ signed int INLINE AICAPLFO_Step(struct _LFO *LFO)
 	return p<<(SHIFT-LFO_SHIFT);
 }
 
-signed int INLINE AICAALFO_Step(struct _LFO *LFO)
+static signed int INLINE AICAALFO_Step(struct _LFO *LFO)
 {
 	int p;
     LFO->phase+=LFO->phase_step;    
diff --git a/plugins/ao/eng_psf/peops2/adsr.h b/plugins/ao/eng_psf/peops2/adsr.h
index 777a0d8..fc031ef 100644
--- a/plugins/ao/eng_psf/peops2/adsr.h
+++ b/plugins/ao/eng_psf/peops2/adsr.h
@@ -24,5 +24,5 @@
 //
 //*************************************************************************//
 
-INLINE void StartADSR(int ch);
-INLINE int  MixADSR(int ch);
+static INLINE void StartADSR(int ch);
+static INLINE int  MixADSR(int ch);
diff --git a/plugins/ao/eng_psf/peops2/adsr2.c b/plugins/ao/eng_psf/peops2/adsr2.c
index 470069c..79af6c0 100644
--- a/plugins/ao/eng_psf/peops2/adsr2.c
+++ b/plugins/ao/eng_psf/peops2/adsr2.c
@@ -66,7 +66,7 @@ void InitADSR(void)                                    // INIT ADSR
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void StartADSR(spu2_state_t *spu, int ch)                          // MIX ADSR
+static INLINE void StartADSR(spu2_state_t *spu, int ch)                          // MIX ADSR
 {
  spu->s_chan[ch].ADSRX.lVolume=1;                           // and init some adsr vars
  spu->s_chan[ch].ADSRX.State=0;
@@ -75,7 +75,7 @@ INLINE void StartADSR(spu2_state_t *spu, int ch)                          // MIX
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE int MixADSR(spu2_state_t *spu, int ch)                             // MIX ADSR
+static INLINE int MixADSR(spu2_state_t *spu, int ch)                             // MIX ADSR
 {    
  if(spu->s_chan[ch].bStop)                                  // should be stopped:
   {                                                    // do release
diff --git a/plugins/ao/eng_psf/peops2/reverb2.c b/plugins/ao/eng_psf/peops2/reverb2.c
index ceab8c5..f8a8066 100644
--- a/plugins/ao/eng_psf/peops2/reverb2.c
+++ b/plugins/ao/eng_psf/peops2/reverb2.c
@@ -51,7 +51,7 @@
 // START REVERB
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void StartREVERB(spu2_state_t *spu, int ch)
+static INLINE void StartREVERB(spu2_state_t *spu, int ch)
 {
  int core=ch/24;
  
@@ -66,7 +66,7 @@ INLINE void StartREVERB(spu2_state_t *spu, int ch)
 // HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void InitREVERB(spu2_state_t *spu)
+static INLINE void InitREVERB(spu2_state_t *spu)
 {
  if(spu->iUseReverb==1)
   {
@@ -79,7 +79,7 @@ INLINE void InitREVERB(spu2_state_t *spu)
 // STORE REVERB
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void StoreREVERB(spu2_state_t *spu, int ch,int ns)
+static INLINE void StoreREVERB(spu2_state_t *spu, int ch,int ns)
 {
  int core=ch/24;
  
@@ -99,7 +99,7 @@ INLINE void StoreREVERB(spu2_state_t *spu, int ch,int ns)
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE int g_buffer(spu2_state_t *spu, int iOff,int core)                   // get_buffer content helper: takes care about wraps
+static INLINE int g_buffer(spu2_state_t *spu, int iOff,int core)                   // get_buffer content helper: takes care about wraps
 {
  short * p=(short *)spu->spuMem;
  iOff=(iOff)+spu->rvb[core].CurrAddr;
@@ -110,7 +110,7 @@ INLINE int g_buffer(spu2_state_t *spu, int iOff,int core)                   // g
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void s_buffer(spu2_state_t *spu, int iOff,int iVal,int core)        // set_buffer content helper: takes care about wraps and clipping
+static INLINE void s_buffer(spu2_state_t *spu, int iOff,int iVal,int core)        // set_buffer content helper: takes care about wraps and clipping
 {
  short * p=(short *)spu->spuMem;
  iOff=(iOff)+spu->rvb[core].CurrAddr;
@@ -122,7 +122,7 @@ INLINE void s_buffer(spu2_state_t *spu, int iOff,int iVal,int core)        // se
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void s_buffer1(spu2_state_t *spu, int iOff,int iVal,int core)      // set_buffer (+1 sample) content helper: takes care about wraps and clipping
+static INLINE void s_buffer1(spu2_state_t *spu, int iOff,int iVal,int core)      // set_buffer (+1 sample) content helper: takes care about wraps and clipping
 {
  short * p=(short *)spu->spuMem;
  iOff=(iOff)+spu->rvb[core].CurrAddr+1;
@@ -134,7 +134,7 @@ INLINE void s_buffer1(spu2_state_t *spu, int iOff,int iVal,int core)      // set
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE int MixREVERBLeft(spu2_state_t *spu, int ns,int core)
+static INLINE int MixREVERBLeft(spu2_state_t *spu, int ns,int core)
 {
  if(spu->iUseReverb==1)
   {
@@ -221,7 +221,7 @@ INLINE int MixREVERBLeft(spu2_state_t *spu, int ns,int core)
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE int MixREVERBRight(spu2_state_t *spu, int core)
+static INLINE int MixREVERBRight(spu2_state_t *spu, int core)
 {
  if(spu->iUseReverb==1)                                     // Neill's reverb:
   {
diff --git a/plugins/ao/eng_psf/peops2/spu2.c b/plugins/ao/eng_psf/peops2/spu2.c
index 4454617..32f56ff 100644
--- a/plugins/ao/eng_psf/peops2/spu2.c
+++ b/plugins/ao/eng_psf/peops2/spu2.c
@@ -170,7 +170,7 @@ const int f[5][2] = {   {    0,  0  },
 //     
 
 
-INLINE void InterpolateUp(spu2_state_t *spu, int ch)
+static INLINE void InterpolateUp(spu2_state_t *spu, int ch)
 {
  if(spu->s_chan[ch].SB[32]==1)                              // flag == 1? calc step and set flag... and don't change the value in this pass
   {
@@ -218,7 +218,7 @@ INLINE void InterpolateUp(spu2_state_t *spu, int ch)
 // even easier interpolation on downsampling, also no special filter, again just "Pete's common sense" tm
 //
 
-INLINE void InterpolateDown(spu2_state_t *spu, int ch)
+static INLINE void InterpolateDown(spu2_state_t *spu, int ch)
 {
  if(spu->s_chan[ch].sinc>=0x20000L)                                 // we would skip at least one val?
   {
@@ -244,7 +244,7 @@ INLINE void InterpolateDown(spu2_state_t *spu, int ch)
 // START SOUND... called by main thread to setup a new sound on a channel
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void StartSound(spu2_state_t *spu, int ch)
+static INLINE void StartSound(spu2_state_t *spu, int ch)
 {
  spu->dwNewChannel2[ch/24]&=~(1<<(ch%24));                  // clear new channel bit
  spu->dwEndChannel2[ch/24]&=~(1<<(ch%24));                  // clear end channel bit
diff --git a/plugins/ao/eng_psf/psx.c b/plugins/ao/eng_psf/psx.c
index 8f646d0..1a0adda 100644
--- a/plugins/ao/eng_psf/psx.c
+++ b/plugins/ao/eng_psf/psx.c
@@ -204,7 +204,7 @@ void GTELOG(const char *a,...)
 	logerror( "%08x: GTE: %08x %s\n", cpu->pc, INS_COFUN( cpu->op ), s_text );
 }
 #else
-INLINE void GTELOG(const char *a, ...) {}
+static INLINE void GTELOG(const char *a, ...) {}
 #endif
 
 static UINT32 getcp2dr( mips_cpu_context *cpu, int n_reg );
@@ -223,7 +223,7 @@ void mips_stop( void )
 #endif
 }
 
-INLINE void mips_set_cp0r(mips_cpu_context *cpu, int reg, UINT32 value )
+static INLINE void mips_set_cp0r(mips_cpu_context *cpu, int reg, UINT32 value )
 {
 	cpu->cp0r[ reg ] = value;
 	if( reg == CP0_SR || reg == CP0_CAUSE )
@@ -240,7 +240,7 @@ INLINE void mips_set_cp0r(mips_cpu_context *cpu, int reg, UINT32 value )
 	}
 }
 
-INLINE void mips_commit_delayed_load(mips_cpu_context *cpu)
+static INLINE void mips_commit_delayed_load(mips_cpu_context *cpu)
 {
 	if( cpu->delayr != 0 )
 	{
@@ -250,7 +250,7 @@ INLINE void mips_commit_delayed_load(mips_cpu_context *cpu)
 	}
 }
 
-INLINE void mips_delayed_branch(mips_cpu_context *cpu, UINT32 n_adr )
+static INLINE void mips_delayed_branch(mips_cpu_context *cpu, UINT32 n_adr )
 {
 	if( ( n_adr & ( ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 3 ) ) != 0 )
 	{
@@ -266,7 +266,7 @@ INLINE void mips_delayed_branch(mips_cpu_context *cpu, UINT32 n_adr )
 	}
 }
 
-INLINE void mips_set_pc(mips_cpu_context *cpu, unsigned val )
+static INLINE void mips_set_pc(mips_cpu_context *cpu, unsigned val )
 {
 	cpu->pc = val;
 	change_pc( val );
@@ -274,7 +274,7 @@ INLINE void mips_set_pc(mips_cpu_context *cpu, unsigned val )
 	cpu->delayv = 0;
 }
 
-INLINE void mips_advance_pc(mips_cpu_context *cpu)
+static INLINE void mips_advance_pc(mips_cpu_context *cpu)
 {
 	if( cpu->delayr == REGPC )
 	{
@@ -287,7 +287,7 @@ INLINE void mips_advance_pc(mips_cpu_context *cpu)
 	}
 }
 
-INLINE void mips_load(mips_cpu_context *cpu, UINT32 n_r, UINT32 n_v )
+static INLINE void mips_load(mips_cpu_context *cpu, UINT32 n_r, UINT32 n_v )
 {
 	mips_advance_pc(cpu);
 	if( n_r != 0 )
@@ -296,7 +296,7 @@ INLINE void mips_load(mips_cpu_context *cpu, UINT32 n_r, UINT32 n_v )
 	}
 }
 
-INLINE void mips_delayed_load( mips_cpu_context *cpu, UINT32 n_r, UINT32 n_v )
+static INLINE void mips_delayed_load( mips_cpu_context *cpu, UINT32 n_r, UINT32 n_v )
 {
 	if( cpu->delayr == REGPC )
 	{
@@ -1905,7 +1905,7 @@ static void setcp2cr(mips_cpu_context *cpu, int n_reg, UINT32 n_value )
 	cpu->cp2cr[ n_reg ].d = n_value;
 }
 
-INLINE INT32 LIM( mips_cpu_context *cpu, INT32 n_value, INT32 n_max, INT32 n_min, UINT32 n_flag )
+static INLINE INT32 LIM( mips_cpu_context *cpu, INT32 n_value, INT32 n_max, INT32 n_min, UINT32 n_flag )
 {
 	if( n_value > n_max )
 	{
@@ -1920,7 +1920,7 @@ INLINE INT32 LIM( mips_cpu_context *cpu, INT32 n_value, INT32 n_max, INT32 n_min
 	return n_value;
 }
 
-INLINE INT64 BOUNDS( mips_cpu_context *cpu, INT64 n_value, INT64 n_max, int n_maxflag, INT64 n_min, int n_minflag )
+static INLINE INT64 BOUNDS( mips_cpu_context *cpu, INT64 n_value, INT64 n_max, int n_maxflag, INT64 n_min, int n_minflag )
 {
 	if( n_value > n_max )
 	{
@@ -1944,7 +1944,7 @@ INLINE INT64 BOUNDS( mips_cpu_context *cpu, INT64 n_value, INT64 n_max, int n_ma
 #define Lm_C3( a ) LIM( cpu, ( a ), 0x00ff, 0x0000, ( 1 << 19 ) )
 #define Lm_D( a ) LIM( cpu, ( a ), 0xffff, 0x0000, ( 1 << 31 ) | ( 1 << 18 ) )
 
-INLINE UINT32 Lm_E( mips_cpu_context *cpu, UINT32 n_z )
+static INLINE UINT32 Lm_E( mips_cpu_context *cpu, UINT32 n_z )
 {
 	if( n_z <= H / 2 )
 	{
diff --git a/plugins/ao/eng_qsf/z80.c b/plugins/ao/eng_qsf/z80.c
index ddcd57c..91e873a 100644
--- a/plugins/ao/eng_qsf/z80.c
+++ b/plugins/ao/eng_qsf/z80.c
@@ -277,70 +277,70 @@ static void take_interrupt(z80_state_t *z80);
 typedef void (*funcptr)(z80_state_t *z80);
 
 #define PROTOTYPES(tablename,prefix) \
-	INLINE void prefix##_00(z80_state_t *z80); INLINE void prefix##_01(z80_state_t *z80); INLINE void prefix##_02(z80_state_t *z80); INLINE void prefix##_03(z80_state_t *z80); \
-	INLINE void prefix##_04(z80_state_t *z80); INLINE void prefix##_05(z80_state_t *z80); INLINE void prefix##_06(z80_state_t *z80); INLINE void prefix##_07(z80_state_t *z80); \
-	INLINE void prefix##_08(z80_state_t *z80); INLINE void prefix##_09(z80_state_t *z80); INLINE void prefix##_0a(z80_state_t *z80); INLINE void prefix##_0b(z80_state_t *z80); \
-	INLINE void prefix##_0c(z80_state_t *z80); INLINE void prefix##_0d(z80_state_t *z80); INLINE void prefix##_0e(z80_state_t *z80); INLINE void prefix##_0f(z80_state_t *z80); \
-	INLINE void prefix##_10(z80_state_t *z80); INLINE void prefix##_11(z80_state_t *z80); INLINE void prefix##_12(z80_state_t *z80); INLINE void prefix##_13(z80_state_t *z80); \
-	INLINE void prefix##_14(z80_state_t *z80); INLINE void prefix##_15(z80_state_t *z80); INLINE void prefix##_16(z80_state_t *z80); INLINE void prefix##_17(z80_state_t *z80); \
-	INLINE void prefix##_18(z80_state_t *z80); INLINE void prefix##_19(z80_state_t *z80); INLINE void prefix##_1a(z80_state_t *z80); INLINE void prefix##_1b(z80_state_t *z80); \
-	INLINE void prefix##_1c(z80_state_t *z80); INLINE void prefix##_1d(z80_state_t *z80); INLINE void prefix##_1e(z80_state_t *z80); INLINE void prefix##_1f(z80_state_t *z80); \
-	INLINE void prefix##_20(z80_state_t *z80); INLINE void prefix##_21(z80_state_t *z80); INLINE void prefix##_22(z80_state_t *z80); INLINE void prefix##_23(z80_state_t *z80); \
-	INLINE void prefix##_24(z80_state_t *z80); INLINE void prefix##_25(z80_state_t *z80); INLINE void prefix##_26(z80_state_t *z80); INLINE void prefix##_27(z80_state_t *z80); \
-	INLINE void prefix##_28(z80_state_t *z80); INLINE void prefix##_29(z80_state_t *z80); INLINE void prefix##_2a(z80_state_t *z80); INLINE void prefix##_2b(z80_state_t *z80); \
-	INLINE void prefix##_2c(z80_state_t *z80); INLINE void prefix##_2d(z80_state_t *z80); INLINE void prefix##_2e(z80_state_t *z80); INLINE void prefix##_2f(z80_state_t *z80); \
-	INLINE void prefix##_30(z80_state_t *z80); INLINE void prefix##_31(z80_state_t *z80); INLINE void prefix##_32(z80_state_t *z80); INLINE void prefix##_33(z80_state_t *z80); \
-	INLINE void prefix##_34(z80_state_t *z80); INLINE void prefix##_35(z80_state_t *z80); INLINE void prefix##_36(z80_state_t *z80); INLINE void prefix##_37(z80_state_t *z80); \
-	INLINE void prefix##_38(z80_state_t *z80); INLINE void prefix##_39(z80_state_t *z80); INLINE void prefix##_3a(z80_state_t *z80); INLINE void prefix##_3b(z80_state_t *z80); \
-	INLINE void prefix##_3c(z80_state_t *z80); INLINE void prefix##_3d(z80_state_t *z80); INLINE void prefix##_3e(z80_state_t *z80); INLINE void prefix##_3f(z80_state_t *z80); \
-	INLINE void prefix##_40(z80_state_t *z80); INLINE void prefix##_41(z80_state_t *z80); INLINE void prefix##_42(z80_state_t *z80); INLINE void prefix##_43(z80_state_t *z80); \
-	INLINE void prefix##_44(z80_state_t *z80); INLINE void prefix##_45(z80_state_t *z80); INLINE void prefix##_46(z80_state_t *z80); INLINE void prefix##_47(z80_state_t *z80); \
-	INLINE void prefix##_48(z80_state_t *z80); INLINE void prefix##_49(z80_state_t *z80); INLINE void prefix##_4a(z80_state_t *z80); INLINE void prefix##_4b(z80_state_t *z80); \
-	INLINE void prefix##_4c(z80_state_t *z80); INLINE void prefix##_4d(z80_state_t *z80); INLINE void prefix##_4e(z80_state_t *z80); INLINE void prefix##_4f(z80_state_t *z80); \
-	INLINE void prefix##_50(z80_state_t *z80); INLINE void prefix##_51(z80_state_t *z80); INLINE void prefix##_52(z80_state_t *z80); INLINE void prefix##_53(z80_state_t *z80); \
-	INLINE void prefix##_54(z80_state_t *z80); INLINE void prefix##_55(z80_state_t *z80); INLINE void prefix##_56(z80_state_t *z80); INLINE void prefix##_57(z80_state_t *z80); \
-	INLINE void prefix##_58(z80_state_t *z80); INLINE void prefix##_59(z80_state_t *z80); INLINE void prefix##_5a(z80_state_t *z80); INLINE void prefix##_5b(z80_state_t *z80); \
-	INLINE void prefix##_5c(z80_state_t *z80); INLINE void prefix##_5d(z80_state_t *z80); INLINE void prefix##_5e(z80_state_t *z80); INLINE void prefix##_5f(z80_state_t *z80); \
-	INLINE void prefix##_60(z80_state_t *z80); INLINE void prefix##_61(z80_state_t *z80); INLINE void prefix##_62(z80_state_t *z80); INLINE void prefix##_63(z80_state_t *z80); \
-	INLINE void prefix##_64(z80_state_t *z80); INLINE void prefix##_65(z80_state_t *z80); INLINE void prefix##_66(z80_state_t *z80); INLINE void prefix##_67(z80_state_t *z80); \
-	INLINE void prefix##_68(z80_state_t *z80); INLINE void prefix##_69(z80_state_t *z80); INLINE void prefix##_6a(z80_state_t *z80); INLINE void prefix##_6b(z80_state_t *z80); \
-	INLINE void prefix##_6c(z80_state_t *z80); INLINE void prefix##_6d(z80_state_t *z80); INLINE void prefix##_6e(z80_state_t *z80); INLINE void prefix##_6f(z80_state_t *z80); \
-	INLINE void prefix##_70(z80_state_t *z80); INLINE void prefix##_71(z80_state_t *z80); INLINE void prefix##_72(z80_state_t *z80); INLINE void prefix##_73(z80_state_t *z80); \
-	INLINE void prefix##_74(z80_state_t *z80); INLINE void prefix##_75(z80_state_t *z80); INLINE void prefix##_76(z80_state_t *z80); INLINE void prefix##_77(z80_state_t *z80); \
-	INLINE void prefix##_78(z80_state_t *z80); INLINE void prefix##_79(z80_state_t *z80); INLINE void prefix##_7a(z80_state_t *z80); INLINE void prefix##_7b(z80_state_t *z80); \
-	INLINE void prefix##_7c(z80_state_t *z80); INLINE void prefix##_7d(z80_state_t *z80); INLINE void prefix##_7e(z80_state_t *z80); INLINE void prefix##_7f(z80_state_t *z80); \
-	INLINE void prefix##_80(z80_state_t *z80); INLINE void prefix##_81(z80_state_t *z80); INLINE void prefix##_82(z80_state_t *z80); INLINE void prefix##_83(z80_state_t *z80); \
-	INLINE void prefix##_84(z80_state_t *z80); INLINE void prefix##_85(z80_state_t *z80); INLINE void prefix##_86(z80_state_t *z80); INLINE void prefix##_87(z80_state_t *z80); \
-	INLINE void prefix##_88(z80_state_t *z80); INLINE void prefix##_89(z80_state_t *z80); INLINE void prefix##_8a(z80_state_t *z80); INLINE void prefix##_8b(z80_state_t *z80); \
-	INLINE void prefix##_8c(z80_state_t *z80); INLINE void prefix##_8d(z80_state_t *z80); INLINE void prefix##_8e(z80_state_t *z80); INLINE void prefix##_8f(z80_state_t *z80); \
-	INLINE void prefix##_90(z80_state_t *z80); INLINE void prefix##_91(z80_state_t *z80); INLINE void prefix##_92(z80_state_t *z80); INLINE void prefix##_93(z80_state_t *z80); \
-	INLINE void prefix##_94(z80_state_t *z80); INLINE void prefix##_95(z80_state_t *z80); INLINE void prefix##_96(z80_state_t *z80); INLINE void prefix##_97(z80_state_t *z80); \
-	INLINE void prefix##_98(z80_state_t *z80); INLINE void prefix##_99(z80_state_t *z80); INLINE void prefix##_9a(z80_state_t *z80); INLINE void prefix##_9b(z80_state_t *z80); \
-	INLINE void prefix##_9c(z80_state_t *z80); INLINE void prefix##_9d(z80_state_t *z80); INLINE void prefix##_9e(z80_state_t *z80); INLINE void prefix##_9f(z80_state_t *z80); \
-	INLINE void prefix##_a0(z80_state_t *z80); INLINE void prefix##_a1(z80_state_t *z80); INLINE void prefix##_a2(z80_state_t *z80); INLINE void prefix##_a3(z80_state_t *z80); \
-	INLINE void prefix##_a4(z80_state_t *z80); INLINE void prefix##_a5(z80_state_t *z80); INLINE void prefix##_a6(z80_state_t *z80); INLINE void prefix##_a7(z80_state_t *z80); \
-	INLINE void prefix##_a8(z80_state_t *z80); INLINE void prefix##_a9(z80_state_t *z80); INLINE void prefix##_aa(z80_state_t *z80); INLINE void prefix##_ab(z80_state_t *z80); \
-	INLINE void prefix##_ac(z80_state_t *z80); INLINE void prefix##_ad(z80_state_t *z80); INLINE void prefix##_ae(z80_state_t *z80); INLINE void prefix##_af(z80_state_t *z80); \
-	INLINE void prefix##_b0(z80_state_t *z80); INLINE void prefix##_b1(z80_state_t *z80); INLINE void prefix##_b2(z80_state_t *z80); INLINE void prefix##_b3(z80_state_t *z80); \
-	INLINE void prefix##_b4(z80_state_t *z80); INLINE void prefix##_b5(z80_state_t *z80); INLINE void prefix##_b6(z80_state_t *z80); INLINE void prefix##_b7(z80_state_t *z80); \
-	INLINE void prefix##_b8(z80_state_t *z80); INLINE void prefix##_b9(z80_state_t *z80); INLINE void prefix##_ba(z80_state_t *z80); INLINE void prefix##_bb(z80_state_t *z80); \
-	INLINE void prefix##_bc(z80_state_t *z80); INLINE void prefix##_bd(z80_state_t *z80); INLINE void prefix##_be(z80_state_t *z80); INLINE void prefix##_bf(z80_state_t *z80); \
-	INLINE void prefix##_c0(z80_state_t *z80); INLINE void prefix##_c1(z80_state_t *z80); INLINE void prefix##_c2(z80_state_t *z80); INLINE void prefix##_c3(z80_state_t *z80); \
-	INLINE void prefix##_c4(z80_state_t *z80); INLINE void prefix##_c5(z80_state_t *z80); INLINE void prefix##_c6(z80_state_t *z80); INLINE void prefix##_c7(z80_state_t *z80); \
-	INLINE void prefix##_c8(z80_state_t *z80); INLINE void prefix##_c9(z80_state_t *z80); INLINE void prefix##_ca(z80_state_t *z80); INLINE void prefix##_cb(z80_state_t *z80); \
-	INLINE void prefix##_cc(z80_state_t *z80); INLINE void prefix##_cd(z80_state_t *z80); INLINE void prefix##_ce(z80_state_t *z80); INLINE void prefix##_cf(z80_state_t *z80); \
-	INLINE void prefix##_d0(z80_state_t *z80); INLINE void prefix##_d1(z80_state_t *z80); INLINE void prefix##_d2(z80_state_t *z80); INLINE void prefix##_d3(z80_state_t *z80); \
-	INLINE void prefix##_d4(z80_state_t *z80); INLINE void prefix##_d5(z80_state_t *z80); INLINE void prefix##_d6(z80_state_t *z80); INLINE void prefix##_d7(z80_state_t *z80); \
-	INLINE void prefix##_d8(z80_state_t *z80); INLINE void prefix##_d9(z80_state_t *z80); INLINE void prefix##_da(z80_state_t *z80); INLINE void prefix##_db(z80_state_t *z80); \
-	INLINE void prefix##_dc(z80_state_t *z80); INLINE void prefix##_dd(z80_state_t *z80); INLINE void prefix##_de(z80_state_t *z80); INLINE void prefix##_df(z80_state_t *z80); \
-	INLINE void prefix##_e0(z80_state_t *z80); INLINE void prefix##_e1(z80_state_t *z80); INLINE void prefix##_e2(z80_state_t *z80); INLINE void prefix##_e3(z80_state_t *z80); \
-	INLINE void prefix##_e4(z80_state_t *z80); INLINE void prefix##_e5(z80_state_t *z80); INLINE void prefix##_e6(z80_state_t *z80); INLINE void prefix##_e7(z80_state_t *z80); \
-	INLINE void prefix##_e8(z80_state_t *z80); INLINE void prefix##_e9(z80_state_t *z80); INLINE void prefix##_ea(z80_state_t *z80); INLINE void prefix##_eb(z80_state_t *z80); \
-	INLINE void prefix##_ec(z80_state_t *z80); INLINE void prefix##_ed(z80_state_t *z80); INLINE void prefix##_ee(z80_state_t *z80); INLINE void prefix##_ef(z80_state_t *z80); \
-	INLINE void prefix##_f0(z80_state_t *z80); INLINE void prefix##_f1(z80_state_t *z80); INLINE void prefix##_f2(z80_state_t *z80); INLINE void prefix##_f3(z80_state_t *z80); \
-	INLINE void prefix##_f4(z80_state_t *z80); INLINE void prefix##_f5(z80_state_t *z80); INLINE void prefix##_f6(z80_state_t *z80); INLINE void prefix##_f7(z80_state_t *z80); \
-	INLINE void prefix##_f8(z80_state_t *z80); INLINE void prefix##_f9(z80_state_t *z80); INLINE void prefix##_fa(z80_state_t *z80); INLINE void prefix##_fb(z80_state_t *z80); \
-	INLINE void prefix##_fc(z80_state_t *z80); INLINE void prefix##_fd(z80_state_t *z80); INLINE void prefix##_fe(z80_state_t *z80); INLINE void prefix##_ff(z80_state_t *z80); \
+	static INLINE void prefix##_00(z80_state_t *z80); static INLINE void prefix##_01(z80_state_t *z80); static INLINE void prefix##_02(z80_state_t *z80); static INLINE void prefix##_03(z80_state_t *z80); \
+	static INLINE void prefix##_04(z80_state_t *z80); static INLINE void prefix##_05(z80_state_t *z80); static INLINE void prefix##_06(z80_state_t *z80); static INLINE void prefix##_07(z80_state_t *z80); \
+	static INLINE void prefix##_08(z80_state_t *z80); static INLINE void prefix##_09(z80_state_t *z80); static INLINE void prefix##_0a(z80_state_t *z80); static INLINE void prefix##_0b(z80_state_t *z80); \
+	static INLINE void prefix##_0c(z80_state_t *z80); static INLINE void prefix##_0d(z80_state_t *z80); static INLINE void prefix##_0e(z80_state_t *z80); static INLINE void prefix##_0f(z80_state_t *z80); \
+	static INLINE void prefix##_10(z80_state_t *z80); static INLINE void prefix##_11(z80_state_t *z80); static INLINE void prefix##_12(z80_state_t *z80); static INLINE void prefix##_13(z80_state_t *z80); \
+	static INLINE void prefix##_14(z80_state_t *z80); static INLINE void prefix##_15(z80_state_t *z80); static INLINE void prefix##_16(z80_state_t *z80); static INLINE void prefix##_17(z80_state_t *z80); \
+	static INLINE void prefix##_18(z80_state_t *z80); static INLINE void prefix##_19(z80_state_t *z80); static INLINE void prefix##_1a(z80_state_t *z80); static INLINE void prefix##_1b(z80_state_t *z80); \
+	static INLINE void prefix##_1c(z80_state_t *z80); static INLINE void prefix##_1d(z80_state_t *z80); static INLINE void prefix##_1e(z80_state_t *z80); static INLINE void prefix##_1f(z80_state_t *z80); \
+	static INLINE void prefix##_20(z80_state_t *z80); static INLINE void prefix##_21(z80_state_t *z80); static INLINE void prefix##_22(z80_state_t *z80); static INLINE void prefix##_23(z80_state_t *z80); \
+	static INLINE void prefix##_24(z80_state_t *z80); static INLINE void prefix##_25(z80_state_t *z80); static INLINE void prefix##_26(z80_state_t *z80); static INLINE void prefix##_27(z80_state_t *z80); \
+	static INLINE void prefix##_28(z80_state_t *z80); static INLINE void prefix##_29(z80_state_t *z80); static INLINE void prefix##_2a(z80_state_t *z80); static INLINE void prefix##_2b(z80_state_t *z80); \
+	static INLINE void prefix##_2c(z80_state_t *z80); static INLINE void prefix##_2d(z80_state_t *z80); static INLINE void prefix##_2e(z80_state_t *z80); static INLINE void prefix##_2f(z80_state_t *z80); \
+	static INLINE void prefix##_30(z80_state_t *z80); static INLINE void prefix##_31(z80_state_t *z80); static INLINE void prefix##_32(z80_state_t *z80); static INLINE void prefix##_33(z80_state_t *z80); \
+	static INLINE void prefix##_34(z80_state_t *z80); static INLINE void prefix##_35(z80_state_t *z80); static INLINE void prefix##_36(z80_state_t *z80); static INLINE void prefix##_37(z80_state_t *z80); \
+	static INLINE void prefix##_38(z80_state_t *z80); static INLINE void prefix##_39(z80_state_t *z80); static INLINE void prefix##_3a(z80_state_t *z80); static INLINE void prefix##_3b(z80_state_t *z80); \
+	static INLINE void prefix##_3c(z80_state_t *z80); static INLINE void prefix##_3d(z80_state_t *z80); static INLINE void prefix##_3e(z80_state_t *z80); static INLINE void prefix##_3f(z80_state_t *z80); \
+	static INLINE void prefix##_40(z80_state_t *z80); static INLINE void prefix##_41(z80_state_t *z80); static INLINE void prefix##_42(z80_state_t *z80); static INLINE void prefix##_43(z80_state_t *z80); \
+	static INLINE void prefix##_44(z80_state_t *z80); static INLINE void prefix##_45(z80_state_t *z80); static INLINE void prefix##_46(z80_state_t *z80); static INLINE void prefix##_47(z80_state_t *z80); \
+	static INLINE void prefix##_48(z80_state_t *z80); static INLINE void prefix##_49(z80_state_t *z80); static INLINE void prefix##_4a(z80_state_t *z80); static INLINE void prefix##_4b(z80_state_t *z80); \
+	static INLINE void prefix##_4c(z80_state_t *z80); static INLINE void prefix##_4d(z80_state_t *z80); static INLINE void prefix##_4e(z80_state_t *z80); static INLINE void prefix##_4f(z80_state_t *z80); \
+	static INLINE void prefix##_50(z80_state_t *z80); static INLINE void prefix##_51(z80_state_t *z80); static INLINE void prefix##_52(z80_state_t *z80); static INLINE void prefix##_53(z80_state_t *z80); \
+	static INLINE void prefix##_54(z80_state_t *z80); static INLINE void prefix##_55(z80_state_t *z80); static INLINE void prefix##_56(z80_state_t *z80); static INLINE void prefix##_57(z80_state_t *z80); \
+	static INLINE void prefix##_58(z80_state_t *z80); static INLINE void prefix##_59(z80_state_t *z80); static INLINE void prefix##_5a(z80_state_t *z80); static INLINE void prefix##_5b(z80_state_t *z80); \
+	static INLINE void prefix##_5c(z80_state_t *z80); static INLINE void prefix##_5d(z80_state_t *z80); static INLINE void prefix##_5e(z80_state_t *z80); static INLINE void prefix##_5f(z80_state_t *z80); \
+	static INLINE void prefix##_60(z80_state_t *z80); static INLINE void prefix##_61(z80_state_t *z80); static INLINE void prefix##_62(z80_state_t *z80); static INLINE void prefix##_63(z80_state_t *z80); \
+	static INLINE void prefix##_64(z80_state_t *z80); static INLINE void prefix##_65(z80_state_t *z80); static INLINE void prefix##_66(z80_state_t *z80); static INLINE void prefix##_67(z80_state_t *z80); \
+	static INLINE void prefix##_68(z80_state_t *z80); static INLINE void prefix##_69(z80_state_t *z80); static INLINE void prefix##_6a(z80_state_t *z80); static INLINE void prefix##_6b(z80_state_t *z80); \
+	static INLINE void prefix##_6c(z80_state_t *z80); static INLINE void prefix##_6d(z80_state_t *z80); static INLINE void prefix##_6e(z80_state_t *z80); static INLINE void prefix##_6f(z80_state_t *z80); \
+	static INLINE void prefix##_70(z80_state_t *z80); static INLINE void prefix##_71(z80_state_t *z80); static INLINE void prefix##_72(z80_state_t *z80); static INLINE void prefix##_73(z80_state_t *z80); \
+	static INLINE void prefix##_74(z80_state_t *z80); static INLINE void prefix##_75(z80_state_t *z80); static INLINE void prefix##_76(z80_state_t *z80); static INLINE void prefix##_77(z80_state_t *z80); \
+	static INLINE void prefix##_78(z80_state_t *z80); static INLINE void prefix##_79(z80_state_t *z80); static INLINE void prefix##_7a(z80_state_t *z80); static INLINE void prefix##_7b(z80_state_t *z80); \
+	static INLINE void prefix##_7c(z80_state_t *z80); static INLINE void prefix##_7d(z80_state_t *z80); static INLINE void prefix##_7e(z80_state_t *z80); static INLINE void prefix##_7f(z80_state_t *z80); \
+	static INLINE void prefix##_80(z80_state_t *z80); static INLINE void prefix##_81(z80_state_t *z80); static INLINE void prefix##_82(z80_state_t *z80); static INLINE void prefix##_83(z80_state_t *z80); \
+	static INLINE void prefix##_84(z80_state_t *z80); static INLINE void prefix##_85(z80_state_t *z80); static INLINE void prefix##_86(z80_state_t *z80); static INLINE void prefix##_87(z80_state_t *z80); \
+	static INLINE void prefix##_88(z80_state_t *z80); static INLINE void prefix##_89(z80_state_t *z80); static INLINE void prefix##_8a(z80_state_t *z80); static INLINE void prefix##_8b(z80_state_t *z80); \
+	static INLINE void prefix##_8c(z80_state_t *z80); static INLINE void prefix##_8d(z80_state_t *z80); static INLINE void prefix##_8e(z80_state_t *z80); static INLINE void prefix##_8f(z80_state_t *z80); \
+	static INLINE void prefix##_90(z80_state_t *z80); static INLINE void prefix##_91(z80_state_t *z80); static INLINE void prefix##_92(z80_state_t *z80); static INLINE void prefix##_93(z80_state_t *z80); \
+	static INLINE void prefix##_94(z80_state_t *z80); static INLINE void prefix##_95(z80_state_t *z80); static INLINE void prefix##_96(z80_state_t *z80); static INLINE void prefix##_97(z80_state_t *z80); \
+	static INLINE void prefix##_98(z80_state_t *z80); static INLINE void prefix##_99(z80_state_t *z80); static INLINE void prefix##_9a(z80_state_t *z80); static INLINE void prefix##_9b(z80_state_t *z80); \
+	static INLINE void prefix##_9c(z80_state_t *z80); static INLINE void prefix##_9d(z80_state_t *z80); static INLINE void prefix##_9e(z80_state_t *z80); static INLINE void prefix##_9f(z80_state_t *z80); \
+	static INLINE void prefix##_a0(z80_state_t *z80); static INLINE void prefix##_a1(z80_state_t *z80); static INLINE void prefix##_a2(z80_state_t *z80); static INLINE void prefix##_a3(z80_state_t *z80); \
+	static INLINE void prefix##_a4(z80_state_t *z80); static INLINE void prefix##_a5(z80_state_t *z80); static INLINE void prefix##_a6(z80_state_t *z80); static INLINE void prefix##_a7(z80_state_t *z80); \
+	static INLINE void prefix##_a8(z80_state_t *z80); static INLINE void prefix##_a9(z80_state_t *z80); static INLINE void prefix##_aa(z80_state_t *z80); static INLINE void prefix##_ab(z80_state_t *z80); \
+	static INLINE void prefix##_ac(z80_state_t *z80); static INLINE void prefix##_ad(z80_state_t *z80); static INLINE void prefix##_ae(z80_state_t *z80); static INLINE void prefix##_af(z80_state_t *z80); \
+	static INLINE void prefix##_b0(z80_state_t *z80); static INLINE void prefix##_b1(z80_state_t *z80); static INLINE void prefix##_b2(z80_state_t *z80); static INLINE void prefix##_b3(z80_state_t *z80); \
+	static INLINE void prefix##_b4(z80_state_t *z80); static INLINE void prefix##_b5(z80_state_t *z80); static INLINE void prefix##_b6(z80_state_t *z80); static INLINE void prefix##_b7(z80_state_t *z80); \
+	static INLINE void prefix##_b8(z80_state_t *z80); static INLINE void prefix##_b9(z80_state_t *z80); static INLINE void prefix##_ba(z80_state_t *z80); static INLINE void prefix##_bb(z80_state_t *z80); \
+	static INLINE void prefix##_bc(z80_state_t *z80); static INLINE void prefix##_bd(z80_state_t *z80); static INLINE void prefix##_be(z80_state_t *z80); static INLINE void prefix##_bf(z80_state_t *z80); \
+	static INLINE void prefix##_c0(z80_state_t *z80); static INLINE void prefix##_c1(z80_state_t *z80); static INLINE void prefix##_c2(z80_state_t *z80); static INLINE void prefix##_c3(z80_state_t *z80); \
+	static INLINE void prefix##_c4(z80_state_t *z80); static INLINE void prefix##_c5(z80_state_t *z80); static INLINE void prefix##_c6(z80_state_t *z80); static INLINE void prefix##_c7(z80_state_t *z80); \
+	static INLINE void prefix##_c8(z80_state_t *z80); static INLINE void prefix##_c9(z80_state_t *z80); static INLINE void prefix##_ca(z80_state_t *z80); static INLINE void prefix##_cb(z80_state_t *z80); \
+	static INLINE void prefix##_cc(z80_state_t *z80); static INLINE void prefix##_cd(z80_state_t *z80); static INLINE void prefix##_ce(z80_state_t *z80); static INLINE void prefix##_cf(z80_state_t *z80); \
+	static INLINE void prefix##_d0(z80_state_t *z80); static INLINE void prefix##_d1(z80_state_t *z80); static INLINE void prefix##_d2(z80_state_t *z80); static INLINE void prefix##_d3(z80_state_t *z80); \
+	static INLINE void prefix##_d4(z80_state_t *z80); static INLINE void prefix##_d5(z80_state_t *z80); static INLINE void prefix##_d6(z80_state_t *z80); static INLINE void prefix##_d7(z80_state_t *z80); \
+	static INLINE void prefix##_d8(z80_state_t *z80); static INLINE void prefix##_d9(z80_state_t *z80); static INLINE void prefix##_da(z80_state_t *z80); static INLINE void prefix##_db(z80_state_t *z80); \
+	static INLINE void prefix##_dc(z80_state_t *z80); static INLINE void prefix##_dd(z80_state_t *z80); static INLINE void prefix##_de(z80_state_t *z80); static INLINE void prefix##_df(z80_state_t *z80); \
+	static INLINE void prefix##_e0(z80_state_t *z80); static INLINE void prefix##_e1(z80_state_t *z80); static INLINE void prefix##_e2(z80_state_t *z80); static INLINE void prefix##_e3(z80_state_t *z80); \
+	static INLINE void prefix##_e4(z80_state_t *z80); static INLINE void prefix##_e5(z80_state_t *z80); static INLINE void prefix##_e6(z80_state_t *z80); static INLINE void prefix##_e7(z80_state_t *z80); \
+	static INLINE void prefix##_e8(z80_state_t *z80); static INLINE void prefix##_e9(z80_state_t *z80); static INLINE void prefix##_ea(z80_state_t *z80); static INLINE void prefix##_eb(z80_state_t *z80); \
+	static INLINE void prefix##_ec(z80_state_t *z80); static INLINE void prefix##_ed(z80_state_t *z80); static INLINE void prefix##_ee(z80_state_t *z80); static INLINE void prefix##_ef(z80_state_t *z80); \
+	static INLINE void prefix##_f0(z80_state_t *z80); static INLINE void prefix##_f1(z80_state_t *z80); static INLINE void prefix##_f2(z80_state_t *z80); static INLINE void prefix##_f3(z80_state_t *z80); \
+	static INLINE void prefix##_f4(z80_state_t *z80); static INLINE void prefix##_f5(z80_state_t *z80); static INLINE void prefix##_f6(z80_state_t *z80); static INLINE void prefix##_f7(z80_state_t *z80); \
+	static INLINE void prefix##_f8(z80_state_t *z80); static INLINE void prefix##_f9(z80_state_t *z80); static INLINE void prefix##_fa(z80_state_t *z80); static INLINE void prefix##_fb(z80_state_t *z80); \
+	static INLINE void prefix##_fc(z80_state_t *z80); static INLINE void prefix##_fd(z80_state_t *z80); static INLINE void prefix##_fe(z80_state_t *z80); static INLINE void prefix##_ff(z80_state_t *z80); \
 static const funcptr tablename[0x100] = {	\
 	prefix##_00,prefix##_01,prefix##_02,prefix##_03,prefix##_04,prefix##_05,prefix##_06,prefix##_07, \
 	prefix##_08,prefix##_09,prefix##_0a,prefix##_0b,prefix##_0c,prefix##_0d,prefix##_0e,prefix##_0f, \
@@ -387,7 +387,7 @@ PROTOTYPES(Z80xycb,xycb);
 /* Burn an odd amount of cycles, that is instructions taking something		*/
 /* different from 4 T-states per opcode (and R increment)					*/
 /****************************************************************************/
-INLINE void BURNODD(z80_state_t *z80, int cycles, int opcodes, int cyclesum)
+static INLINE void BURNODD(z80_state_t *z80, int cycles, int opcodes, int cyclesum)
 {
 	if( cycles > 0 )
 	{
@@ -399,7 +399,7 @@ INLINE void BURNODD(z80_state_t *z80, int cycles, int opcodes, int cyclesum)
 /***************************************************************
  * define an opcode function
  ***************************************************************/
-#define OP(prefix,opcode)  INLINE void prefix##_##opcode(z80_state_t *z80)
+#define OP(prefix,opcode)  static INLINE void prefix##_##opcode(z80_state_t *z80)
 
 /***************************************************************
  * adjust cycle count by n T-states
@@ -533,7 +533,7 @@ INLINE void BURNODD(z80_state_t *z80, int cycles, int opcodes, int cyclesum)
 /***************************************************************
  * Read a word from given memory location
  ***************************************************************/
-INLINE void RM16( z80_state_t *z80, UINT32 addr, PAIR *r )
+static INLINE void RM16( z80_state_t *z80, UINT32 addr, PAIR *r )
 {
 	r->b.l = RM(addr);
 	r->b.h = RM((addr+1)&0xffff);
@@ -547,7 +547,7 @@ INLINE void RM16( z80_state_t *z80, UINT32 addr, PAIR *r )
 /***************************************************************
  * Write a word to given memory location
  ***************************************************************/
-INLINE void WM16( z80_state_t *z80, UINT32 addr, PAIR *r )
+static INLINE void WM16( z80_state_t *z80, UINT32 addr, PAIR *r )
 {
 	WM(addr,r->b.l);
 	WM((addr+1)&0xffff,r->b.h);
@@ -558,7 +558,7 @@ INLINE void WM16( z80_state_t *z80, UINT32 addr, PAIR *r )
  * reading opcodes. In case of system with memory mapped I/O,
  * this function can be used to greatly speed up emulation
  ***************************************************************/
-INLINE UINT8 ROP(z80_state_t *z80)
+static INLINE UINT8 ROP(z80_state_t *z80)
 {
 	unsigned pc = _PCD;
 	_PC++;
@@ -571,14 +571,14 @@ INLINE UINT8 ROP(z80_state_t *z80)
  * support systems that use different encoding mechanisms for
  * opcodes and opcode arguments
  ***************************************************************/
-INLINE UINT8 ARG(z80_state_t *z80)
+static INLINE UINT8 ARG(z80_state_t *z80)
 {
 	unsigned pc = _PCD;
 	_PC++;
 	return cpu_readop_arg(z80->userdata, pc);
 }
 
-INLINE UINT32 ARG16(z80_state_t *z80)
+static INLINE UINT32 ARG16(z80_state_t *z80)
 {
 	unsigned pc = _PCD;
 	_PC += 2;
@@ -825,7 +825,7 @@ INLINE UINT32 ARG16(z80_state_t *z80)
 /***************************************************************
  * INC	r8
  ***************************************************************/
-INLINE UINT8 INC(z80_state_t *z80, UINT8 value)
+static INLINE UINT8 INC(z80_state_t *z80, UINT8 value)
 {
 	UINT8 res = value + 1;
 	_F = (_F & CF) | z80->SZHV_inc[res];
@@ -835,7 +835,7 @@ INLINE UINT8 INC(z80_state_t *z80, UINT8 value)
 /***************************************************************
  * DEC	r8
  ***************************************************************/
-INLINE UINT8 DEC(z80_state_t *z80, UINT8 value)
+static INLINE UINT8 DEC(z80_state_t *z80, UINT8 value)
 {
 	UINT8 res = value - 1;
 	_F = (_F & CF) | z80->SZHV_dec[res];
@@ -1493,7 +1493,7 @@ asm (															\
 /***************************************************************
  * RLC	r8
  ***************************************************************/
-INLINE UINT8 RLC(z80_state_t *z80, UINT8 value)
+static INLINE UINT8 RLC(z80_state_t *z80, UINT8 value)
 {
 	unsigned res = value;
 	unsigned c = (res & 0x80) ? CF : 0;
@@ -1505,7 +1505,7 @@ INLINE UINT8 RLC(z80_state_t *z80, UINT8 value)
 /***************************************************************
  * RRC	r8
  ***************************************************************/
-INLINE UINT8 RRC(z80_state_t *z80, UINT8 value)
+static INLINE UINT8 RRC(z80_state_t *z80, UINT8 value)
 {
 	unsigned res = value;
 	unsigned c = (res & 0x01) ? CF : 0;
@@ -1517,7 +1517,7 @@ INLINE UINT8 RRC(z80_state_t *z80, UINT8 value)
 /***************************************************************
  * RL	r8
  ***************************************************************/
-INLINE UINT8 RL(z80_state_t *z80, UINT8 value)
+static INLINE UINT8 RL(z80_state_t *z80, UINT8 value)
 {
 	unsigned res = value;
 	unsigned c = (res & 0x80) ? CF : 0;
@@ -1529,7 +1529,7 @@ INLINE UINT8 RL(z80_state_t *z80, UINT8 value)
 /***************************************************************
  * RR	r8
  ***************************************************************/
-INLINE UINT8 RR(z80_state_t *z80, UINT8 value)
+static INLINE UINT8 RR(z80_state_t *z80, UINT8 value)
 {
 	unsigned res = value;
 	unsigned c = (res & 0x01) ? CF : 0;
@@ -1541,7 +1541,7 @@ INLINE UINT8 RR(z80_state_t *z80, UINT8 value)
 /***************************************************************
  * SLA	r8
  ***************************************************************/
-INLINE UINT8 SLA(z80_state_t *z80, UINT8 value)
+static INLINE UINT8 SLA(z80_state_t *z80, UINT8 value)
 {
 	unsigned res = value;
 	unsigned c = (res & 0x80) ? CF : 0;
@@ -1553,7 +1553,7 @@ INLINE UINT8 SLA(z80_state_t *z80, UINT8 value)
 /***************************************************************
  * SRA	r8
  ***************************************************************/
-INLINE UINT8 SRA(z80_state_t *z80, UINT8 value)
+static INLINE UINT8 SRA(z80_state_t *z80, UINT8 value)
 {
 	unsigned res = value;
 	unsigned c = (res & 0x01) ? CF : 0;
@@ -1565,7 +1565,7 @@ INLINE UINT8 SRA(z80_state_t *z80, UINT8 value)
 /***************************************************************
  * SLL	r8
  ***************************************************************/
-INLINE UINT8 SLL(z80_state_t *z80, UINT8 value)
+static INLINE UINT8 SLL(z80_state_t *z80, UINT8 value)
 {
 	unsigned res = value;
 	unsigned c = (res & 0x80) ? CF : 0;
@@ -1577,7 +1577,7 @@ INLINE UINT8 SLL(z80_state_t *z80, UINT8 value)
 /***************************************************************
  * SRL	r8
  ***************************************************************/
-INLINE UINT8 SRL(z80_state_t *z80, UINT8 value)
+static INLINE UINT8 SRL(z80_state_t *z80, UINT8 value)
 {
 	unsigned res = value;
 	unsigned c = (res & 0x01) ? CF : 0;
@@ -1606,7 +1606,7 @@ INLINE UINT8 SRL(z80_state_t *z80, UINT8 value)
 /***************************************************************
  * RES	bit,r8
  ***************************************************************/
-INLINE UINT8 RES(z80_state_t *z80, UINT8 bit, UINT8 value)
+static INLINE UINT8 RES(z80_state_t *z80, UINT8 bit, UINT8 value)
 {
 	return value & ~(1<<bit);
 }
@@ -1614,7 +1614,7 @@ INLINE UINT8 RES(z80_state_t *z80, UINT8 bit, UINT8 value)
 /***************************************************************
  * SET	bit,r8
  ***************************************************************/
-INLINE UINT8 SET(z80_state_t *z80, UINT8 bit, UINT8 value)
+static INLINE UINT8 SET(z80_state_t *z80, UINT8 bit, UINT8 value)
 {
 	return value | (1<<bit);
 }
diff --git a/plugins/ao/eng_ssf/scsp.c b/plugins/ao/eng_ssf/scsp.c
index f3a3d9d..0afff77 100644
--- a/plugins/ao/eng_ssf/scsp.c
+++ b/plugins/ao/eng_ssf/scsp.c
@@ -858,7 +858,7 @@ void SCSP_TimersAddTicks(struct _SCSP *SCSP, int ticks)
 	}
 }
 
-INLINE INT32 SCSP_UpdateSlot(struct _SCSP *SCSP, struct _SLOT *slot)
+static INLINE INT32 SCSP_UpdateSlot(struct _SCSP *SCSP, struct _SLOT *slot)
 {
 	INT32 sample;
 	int step=slot->step;
diff --git a/plugins/ao/eng_ssf/scsplfo.c b/plugins/ao/eng_ssf/scsplfo.c
index c25e3c8..0a8281c 100644
--- a/plugins/ao/eng_ssf/scsplfo.c
+++ b/plugins/ao/eng_ssf/scsplfo.c
@@ -104,7 +104,7 @@ void LFO_Init(void)
 	}
 }
 
-signed int INLINE PLFO_Step(struct _LFO *LFO)
+static signed int INLINE PLFO_Step(struct _LFO *LFO)
 {
 	int p;
     LFO->phase+=LFO->phase_step;    
@@ -116,7 +116,7 @@ signed int INLINE PLFO_Step(struct _LFO *LFO)
 	return p<<(SHIFT-LFO_SHIFT);
 }
 
-signed int INLINE ALFO_Step(struct _LFO *LFO)
+static signed int INLINE ALFO_Step(struct _LFO *LFO)
 {
 	int p;
     LFO->phase+=LFO->phase_step;    
diff --git a/plugins/ao/plugin.c b/plugins/ao/plugin.c
index 7964c31..caaa949 100644
--- a/plugins/ao/plugin.c
+++ b/plugins/ao/plugin.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/artwork/COPYING b/plugins/artwork/COPYING
new file mode 100644
index 0000000..f88ac12
--- /dev/null
+++ b/plugins/artwork/COPYING
@@ -0,0 +1,20 @@
+DeaDBeeF Album Art plugin
+Copyright (C) 2009-2014 Viktor Semykin, Alexey Yakovenko et al.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
diff --git a/plugins/artwork/Makefile.am b/plugins/artwork/Makefile.am
index 3437e85..9840b5e 100644
--- a/plugins/artwork/Makefile.am
+++ b/plugins/artwork/Makefile.am
@@ -1,9 +1,20 @@
 if HAVE_ARTWORK
 artworkdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = artwork.la
-artwork_la_SOURCES = artwork.c artwork.h albumartorg.c albumartorg.h lastfm.c lastfm.h wos.c wos.h escape.c escape.h
 
-artwork_la_LDFLAGS = -module
+if HAVE_OGG
+ogg_def = -DUSE_OGG=1
+ogg_libs = $(OGG_LIBS)
+endif
+
+if ARTWORK_USE_VFS_CURL
+artwork_net_cflags = -DUSE_VFS_CURL
+artwork_net_sources =  albumartorg.c albumartorg.h lastfm.c lastfm.h wos.c wos.h escape.c escape.h
+endif
+
+artwork_la_SOURCES = artwork.c artwork.h $(artwork_net_sources)
+
+artwork_la_LDFLAGS = -module -avoid-version
 
 if HAVE_IMLIB2
 ARTWORK_DEPS=$(IMLIB2_DEPS_LIBS)
@@ -15,9 +26,9 @@ endif
 
 if HAVE_FLAC
 FLAC_DEPS=$(FLAC_LIBS)
-FLAC_CFLAGS=-DUSE_METAFLAC
+flac_cflags=-DUSE_METAFLAC $(FLAC_CFLAGS)
 endif
 
-AM_CFLAGS = $(CFLAGS) $(ARTWORK_CFLAGS) $(FLAC_CFLAGS) -std=c99
-artwork_la_LIBADD = $(LDADD) $(ARTWORK_DEPS) $(FLAC_DEPS)
+AM_CFLAGS = $(CFLAGS) $(ARTWORK_CFLAGS) $(flac_cflags) $(artwork_net_cflags) $(ogg_def) -std=c99
+artwork_la_LIBADD = $(LDADD) $(ARTWORK_DEPS) $(FLAC_DEPS) $(ogg_libs)
 endif
diff --git a/plugins/artwork/Makefile.in b/plugins/artwork/Makefile.in
index 3a4fbab..ea90a99 100644
--- a/plugins/artwork/Makefile.in
+++ b/plugins/artwork/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/artwork
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -117,30 +145,60 @@ am__DEPENDENCIES_1 =
 @HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_TRUE@	$(am__DEPENDENCIES_1)
 @HAVE_ARTWORK_TRUE@@HAVE_FLAC_TRUE at am__DEPENDENCIES_3 =  \
 @HAVE_ARTWORK_TRUE@@HAVE_FLAC_TRUE@	$(am__DEPENDENCIES_1)
+ at HAVE_ARTWORK_TRUE@@HAVE_OGG_TRUE at am__DEPENDENCIES_4 =  \
+ at HAVE_ARTWORK_TRUE@@HAVE_OGG_TRUE@	$(am__DEPENDENCIES_1)
 @HAVE_ARTWORK_TRUE at artwork_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
- at HAVE_ARTWORK_TRUE@	$(am__DEPENDENCIES_3)
+ at HAVE_ARTWORK_TRUE@	$(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4)
 am__artwork_la_SOURCES_DIST = artwork.c artwork.h albumartorg.c \
 	albumartorg.h lastfm.c lastfm.h wos.c wos.h escape.c escape.h
- at HAVE_ARTWORK_TRUE@am_artwork_la_OBJECTS = artwork.lo albumartorg.lo \
- at HAVE_ARTWORK_TRUE@	lastfm.lo wos.lo escape.lo
+ at ARTWORK_USE_VFS_CURL_TRUE@@HAVE_ARTWORK_TRUE at am__objects_1 =  \
+ at ARTWORK_USE_VFS_CURL_TRUE@@HAVE_ARTWORK_TRUE@	albumartorg.lo \
+ at ARTWORK_USE_VFS_CURL_TRUE@@HAVE_ARTWORK_TRUE@	lastfm.lo wos.lo \
+ at ARTWORK_USE_VFS_CURL_TRUE@@HAVE_ARTWORK_TRUE@	escape.lo
+ at HAVE_ARTWORK_TRUE@am_artwork_la_OBJECTS = artwork.lo $(am__objects_1)
 artwork_la_OBJECTS = $(am_artwork_la_OBJECTS)
-artwork_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+artwork_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(artwork_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_ARTWORK_TRUE at am_artwork_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(artwork_la_SOURCES)
 DIST_SOURCES = $(am__artwork_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -148,6 +206,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -174,6 +249,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -194,10 +270,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -220,6 +298,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -273,6 +352,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -291,6 +371,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -316,13 +398,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -331,7 +417,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -391,16 +479,20 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @HAVE_ARTWORK_TRUE at artworkdir = $(libdir)/$(PACKAGE)
 @HAVE_ARTWORK_TRUE at pkglib_LTLIBRARIES = artwork.la
- at HAVE_ARTWORK_TRUE@artwork_la_SOURCES = artwork.c artwork.h albumartorg.c albumartorg.h lastfm.c lastfm.h wos.c wos.h escape.c escape.h
- at HAVE_ARTWORK_TRUE@artwork_la_LDFLAGS = -module
+ at HAVE_ARTWORK_TRUE@@HAVE_OGG_TRUE at ogg_def = -DUSE_OGG=1
+ at HAVE_ARTWORK_TRUE@@HAVE_OGG_TRUE at ogg_libs = $(OGG_LIBS)
+ at ARTWORK_USE_VFS_CURL_TRUE@@HAVE_ARTWORK_TRUE at artwork_net_cflags = -DUSE_VFS_CURL
+ at ARTWORK_USE_VFS_CURL_TRUE@@HAVE_ARTWORK_TRUE at artwork_net_sources = albumartorg.c albumartorg.h lastfm.c lastfm.h wos.c wos.h escape.c escape.h
+ at HAVE_ARTWORK_TRUE@artwork_la_SOURCES = artwork.c artwork.h $(artwork_net_sources)
+ at HAVE_ARTWORK_TRUE@artwork_la_LDFLAGS = -module -avoid-version
 @HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_FALSE at ARTWORK_DEPS = $(JPEG_DEPS_LIBS) $(PNG_DEPS_LIBS)
 @HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_TRUE at ARTWORK_DEPS = $(IMLIB2_DEPS_LIBS)
 @HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_FALSE at ARTWORK_CFLAGS = $(JPEG_DEPS_CFLAGS) $(PNG_DEPS_CFLAGS)
 @HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_TRUE at ARTWORK_CFLAGS = -DUSE_IMLIB2
 @HAVE_ARTWORK_TRUE@@HAVE_FLAC_TRUE at FLAC_DEPS = $(FLAC_LIBS)
- at HAVE_ARTWORK_TRUE@@HAVE_FLAC_TRUE at FLAC_CFLAGS = -DUSE_METAFLAC
- at HAVE_ARTWORK_TRUE@AM_CFLAGS = $(CFLAGS) $(ARTWORK_CFLAGS) $(FLAC_CFLAGS) -std=c99
- at HAVE_ARTWORK_TRUE@artwork_la_LIBADD = $(LDADD) $(ARTWORK_DEPS) $(FLAC_DEPS)
+ at HAVE_ARTWORK_TRUE@@HAVE_FLAC_TRUE at flac_cflags = -DUSE_METAFLAC $(FLAC_CFLAGS)
+ at HAVE_ARTWORK_TRUE@AM_CFLAGS = $(CFLAGS) $(ARTWORK_CFLAGS) $(flac_cflags) $(artwork_net_cflags) $(ogg_def) -std=c99
+ at HAVE_ARTWORK_TRUE@artwork_la_LIBADD = $(LDADD) $(ARTWORK_DEPS) $(FLAC_DEPS) $(ogg_libs)
 all: all-am
 
 .SUFFIXES:
@@ -435,6 +527,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -461,14 +554,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 artwork.la: $(artwork_la_OBJECTS) $(artwork_la_DEPENDENCIES) $(EXTRA_artwork_la_DEPENDENCIES) 
-	$(artwork_la_LINK) $(am_artwork_la_rpath) $(artwork_la_OBJECTS) $(artwork_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(artwork_la_LINK) $(am_artwork_la_rpath) $(artwork_la_OBJECTS) $(artwork_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -483,25 +579,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wos.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -509,26 +605,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -540,15 +625,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -557,6 +638,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -701,19 +797,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/artwork/albumartorg.c b/plugins/artwork/albumartorg.c
index 1b21f3f..f686022 100644
--- a/plugins/artwork/albumartorg.c
+++ b/plugins/artwork/albumartorg.c
@@ -1,21 +1,27 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    Album Art plugin for DeaDBeeF
+    Copyright (C) 2009-2011 Viktor Semykin <thesame.ml at gmail.com>
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
@@ -37,7 +43,7 @@ fetch_from_albumart_org (const char *artist, const char *album, const char *dest
     char url [1024];
     char *artist_url = uri_escape (artist, 0);
     char *album_url = uri_escape (album, 0);
-    snprintf (url, sizeof (url), "http://www.albumart.org/index.php?srchkey=%s+%s&itempage=1&newsearch=1&searchindex=Music", artist_url, album_url);
+    snprintf (url, sizeof (url), "http://www.albumart.org/index.php?searchkey=%s+%s&itempage=1&newsearch=1&searchindex=Music", artist_url, album_url);
     free (artist_url);
     free (album_url);
 
diff --git a/plugins/artwork/albumartorg.h b/plugins/artwork/albumartorg.h
index 46ade53..dc06254 100644
--- a/plugins/artwork/albumartorg.h
+++ b/plugins/artwork/albumartorg.h
@@ -1,21 +1,27 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    Album Art plugin for DeaDBeeF
+    Copyright (C) 2009-2011 Viktor Semykin <thesame.ml at gmail.com>
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifndef __ALBUMARTORG_H
 #define __ALBUMARTORG_H
 
diff --git a/plugins/artwork/artwork.c b/plugins/artwork/artwork.c
index 44aa68d..cc0e632 100644
--- a/plugins/artwork/artwork.c
+++ b/plugins/artwork/artwork.c
@@ -1,3 +1,27 @@
+/*
+    Album Art plugin for DeaDBeeF
+    Copyright (C) 2009-2011 Viktor Semykin <thesame.ml at gmail.com>
+    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
 #ifdef HAVE_CONFIG_H
 #  include "../../config.h"
 #endif
@@ -22,9 +46,11 @@
 #include <assert.h>
 #include "../../deadbeef.h"
 #include "artwork.h"
+#ifdef USE_VFS_CURL
 #include "lastfm.h"
 #include "albumartorg.h"
 #include "wos.h"
+#endif
 
 #ifdef USE_IMLIB2
 #include <Imlib2.h>
@@ -40,6 +66,8 @@ static uintptr_t imlib_mutex;
 #include <FLAC/metadata.h>
 #endif
 
+#include "../../strdupa.h"
+
 #define min(x,y) ((x)<(y)?(x):(y))
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
@@ -85,9 +113,11 @@ static intptr_t tid;
 
 static int artwork_enable_embedded;
 static int artwork_enable_local;
+#ifdef USE_VFS_CURL
 static int artwork_enable_lfm;
 static int artwork_enable_aao;
 static int artwork_enable_wos;
+#endif
 static time_t artwork_reset_time;
 static char artwork_filemask[200];
 
@@ -95,11 +125,38 @@ static const char *get_default_cover (void) {
     return default_cover;
 }
 
-int
+static int
+esc_char (char c) {
+    if (c < 1
+        || (c >= 'a' && c <= 'z')
+        || (c >= 'A' && c <= 'Z')
+        || (c >= '0' && c <= '9')
+        || c == ' '
+        || c == '_'
+        || c == '-') {
+        return c;
+    }
+    return '_';
+}
+
+static int
 make_cache_dir_path (char *path, int size, const char *artist, int img_size) {
+    char esc_artist[PATH_MAX];
+    int i;
+
+    if (artist) {
+        for (i = 0; artist[i]; i++) {
+            esc_artist[i] = esc_char (artist[i]);
+        }
+        esc_artist[i] = 0;
+    }
+    else {
+        strcpy (esc_artist, "Unknown artist");
+    }
+
     const char *cache = getenv ("XDG_CACHE_HOME");
     int sz;
-    
+
     if (img_size == -1) {
         sz = snprintf (path, size, cache ? "%s/deadbeef/covers/" : "%s/.cache/deadbeef/covers/", cache ? cache : getenv ("HOME"));
     }
@@ -108,7 +165,7 @@ make_cache_dir_path (char *path, int size, const char *artist, int img_size) {
     }
     path += sz;
 
-    sz += snprintf (path, size-sz, "%s", artist);
+    sz += snprintf (path, size-sz, "%s", esc_artist);
     for (char *p = path; *p; p++) {
         if (*p == '/') {
             *p = '_';
@@ -117,13 +174,53 @@ make_cache_dir_path (char *path, int size, const char *artist, int img_size) {
     return sz;
 }
 
-void
-make_cache_path (char *path, int size, const char *album, const char *artist, int img_size) {
+static int
+make_cache_path2 (char *path, int size, const char *fname, const char *album, const char *artist, int img_size) {
+    *path = 0;
+
+    int unk = 0;
+    int unk_artist = 0;
+
+    if (!album || !(*album)) {
+        album = "Unknown album";
+        unk = 1;
+    }
+    if (!artist || !(*artist)) {
+        artist = "Unknown artist";
+        unk_artist = 1;
+    }
+
+    if (unk)
+    {
+        if (fname) {
+            album = fname;
+        }
+        else if (!unk_artist) {
+            album = artist;
+        }
+        else {
+            trace ("not possible to get any unique album name\n");
+            return -1;
+        }
+    }
+
     char *p = path;
+    char esc_album[PATH_MAX];
+    const char *palbum = album;
+    size_t l = strlen (album);
+    if (l > 200) {
+        palbum = album + l - 200;
+    }
+    int i;
+    for (i = 0; palbum[i]; i++) {
+        esc_album[i] = esc_char (palbum[i]);
+    }
+    esc_album[i] = 0;
+
     int sz = make_cache_dir_path (path, size, artist, img_size);
     size -= sz;
     path += sz;
-    sz = snprintf (path, size, "/%s.jpg", album);
+    sz = snprintf (path, size, "/%s.jpg", esc_album);
     for (char *p = path+1; *p; p++) {
         if (*p == '/') {
             *p = '_';
@@ -131,7 +228,12 @@ make_cache_path (char *path, int size, const char *album, const char *artist, in
     }
 }
 
-void
+static void
+make_cache_path (char *path, int size, const char *album, const char *artist, int img_size) {
+    make_cache_path2 (path, size, NULL, album, artist, img_size);
+}
+
+static void
 queue_add (const char *fname, const char *artist, const char *album, int img_size, artwork_callback callback, void *user_data) {
     if (!artist) {
         artist = "";
@@ -175,7 +277,7 @@ queue_add (const char *fname, const char *artist, const char *album, int img_siz
     deadbeef->cond_signal (cond);
 }
 
-void
+static void
 queue_pop (void) {
     deadbeef->mutex_lock (mutex);
     cover_query_t *next = queue ? queue->next : NULL;
@@ -305,7 +407,7 @@ jpeg_resize (const char *fname, const char *outname, int scaled_size) {
     jpeg_start_decompress (&cinfo);
 
     int i;
-    
+
     cinfo_out.err = cinfo.err;
 
     jpeg_create_compress(&cinfo_out);
@@ -382,7 +484,7 @@ jpeg_resize (const char *fname, const char *outname, int scaled_size) {
     return 0;
 }
 
-int
+static int
 png_resize (const char *fname, const char *outname, int scaled_size) {
     png_structp png_ptr = NULL;
     png_infop info_ptr = NULL;
@@ -530,6 +632,8 @@ png_resize (const char *fname, const char *outname, int scaled_size) {
     for (row = 0; row < height; row++)
         row_pointers[row] = NULL;
 
+    png_read_update_info(png_ptr, info_ptr);
+
     for (row = 0; row < height; row++)
         row_pointers[row] = png_malloc(png_ptr, png_get_rowbytes(png_ptr,
                     info_ptr));
@@ -548,7 +652,7 @@ png_resize (const char *fname, const char *outname, int scaled_size) {
 
 
     int i;
-    
+
     cinfo_out.err = jpeg_std_error (&jerr.pub);
     jerr.pub.error_exit = my_error_exit;
     /* Establish the setjmp return context for my_error_exit to use. */
@@ -760,6 +864,7 @@ copy_file (const char *in, const char *out, int img_size) {
 }
 
 static const char *filter_custom_mask = NULL;
+
 static int
 filter_custom (const struct dirent *f)
 {
@@ -812,6 +917,43 @@ id3v2_skip_str (int enc, uint8_t *ptr, uint8_t *end) {
     return NULL;
 }
 
+#ifdef USE_METAFLAC
+static size_t
+flac_io_read (void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle) {
+    return deadbeef->fread (ptr, size, nmemb, (DB_FILE *)handle);
+}
+
+static int
+flac_io_seek (FLAC__IOHandle handle, FLAC__int64 offset, int whence) {
+    return deadbeef->fseek ((DB_FILE *)handle, offset, whence);
+}
+
+static FLAC__int64
+flac_io_tell (FLAC__IOHandle handle) {
+    return deadbeef->ftell ((DB_FILE *)handle);
+}
+
+static int
+flac_io_eof (FLAC__IOHandle handle) {
+    int64_t pos = deadbeef->ftell ((DB_FILE *)handle);
+    return pos == deadbeef->fgetlength ((DB_FILE *)handle);
+}
+
+static int
+flac_io_close (FLAC__IOHandle handle) {
+    deadbeef->fclose ((DB_FILE *)handle);
+    return 0;
+}
+
+static FLAC__IOCallbacks iocb = {
+    .read = flac_io_read,
+    .write = NULL,
+    .seek = flac_io_seek,
+    .tell = flac_io_tell,
+    .eof = flac_io_eof,
+    .close = flac_io_close,
+};
+#endif
 
 static void
 fetcher_thread (void *none)
@@ -849,7 +991,7 @@ fetcher_thread (void *none)
 
             trace ("fetching cover for %s %s\n", param->album, param->artist);
             char cache_path[1024];
-            make_cache_path (cache_path, sizeof (cache_path), param->album, param->artist, -1);
+            make_cache_path2 (cache_path, sizeof (cache_path), param->fname, param->album, param->artist, -1);
             int got_pic = 0;
 
             if (deadbeef->is_local_file (param->fname)) {
@@ -870,11 +1012,23 @@ fetcher_thread (void *none)
                                             trace ("artwork: id3v2 APIC frame is too small\n");
                                             continue;
                                         }
+
                                         uint8_t *data = f->data;
-                                        if (tag.version[0] == 4) {
-                                            // skip size
+
+                                        if (tag.version[0] == 4 && (f->flags[1] & 1)) {
                                             data += 4;
                                         }
+#if 0
+                                        printf ("version: %d, flags: %d %d\n", (int)tag.version[0], (int)f->flags[0], (int)f->flags[1]);
+                                        for (int i = 0; i < 20; i++) {
+                                            printf ("%c", data[i] < 0x20 ? '?' : data[i]);
+                                        }
+                                        printf ("\n");
+                                        for (int i = 0; i < 20; i++) {
+                                            printf ("%02x ", data[i]);
+                                        }
+                                        printf ("\n");
+#endif
                                         uint8_t *end = f->data + f->size;
                                         int enc = *data;
                                         data++; // enc
@@ -884,7 +1038,7 @@ fetcher_thread (void *none)
                                             trace ("artwork: corrupted id3v2 APIC frame\n");
                                             continue;
                                         }
-                                        if (strcasecmp (data, "image/jpeg") && strcasecmp (data, "image/png")) {
+                                        if (strcasecmp (data, "image/jpeg") && strcasecmp (data, "image/png") && strcasecmp (data, "image/gif")) {
                                             trace ("artwork: unsupported mime type: %s\n", data);
                                             continue;
                                         }
@@ -973,7 +1127,7 @@ fetcher_thread (void *none)
                                         trace ("found apev2 cover art of %d bytes (%s)\n", sz, ext);
                                         char tmp_path[1024];
                                         char cache_path[1024];
-                                        make_cache_path (cache_path, sizeof (cache_path), param->album, param->artist, -1);
+                                        make_cache_path2 (cache_path, sizeof (cache_path), param->fname, param->album, param->artist, -1);
                                         trace ("will write apev2 cover art into %s\n", cache_path);
                                         snprintf (tmp_path, sizeof (tmp_path), "%s.part", cache_path);
                                         FILE *out = fopen (tmp_path, "w+b");
@@ -1018,11 +1172,29 @@ fetcher_thread (void *none)
                             is_ogg = 1;
                         }
 
-                        if(! (is_ogg? FLAC__metadata_chain_read_ogg(chain, filename) : FLAC__metadata_chain_read(chain, filename)) ) {
-                            trace ("%s: ERROR: reading metadata", filename);
+                        DB_FILE *file = deadbeef->fopen (filename);
+                        if (!file) {
+                            break;
+                        }
+
+                        int res = 0;
+                        if (is_ogg) {
+#if USE_OGG
+                            res = FLAC__metadata_chain_read_ogg_with_callbacks(chain, (FLAC__IOHandle)file, iocb);
+#endif
+                        }
+                        else
+                        {
+                            res = FLAC__metadata_chain_read_with_callbacks(chain, (FLAC__IOHandle)file, iocb);
+                        }
+
+                        if(!res) {
+                            trace ("artwork: failed to read metadata from flac: %s\n", filename);
+                            deadbeef->fclose (file);
                             FLAC__metadata_chain_delete(chain);
                             break;
                         }
+                        deadbeef->fclose (file);
                         FLAC__StreamMetadata *picture = 0;
                         FLAC__Metadata_Iterator *iterator = FLAC__metadata_iterator_new();
                         FLAC__metadata_iterator_init(iterator, chain);
@@ -1042,7 +1214,7 @@ fetcher_thread (void *none)
                         trace ("found flac cover art of %d bytes (%s)\n", pic->data_length, pic->description);
                         char tmp_path[1024];
                         char cache_path[1024];
-                        make_cache_path (cache_path, sizeof (cache_path), param->album, param->artist, -1);
+                        make_cache_path2 (cache_path, sizeof (cache_path), param->fname, param->album, param->artist, -1);
                         trace ("will write flac cover art into %s\n", cache_path);
                         snprintf (tmp_path, sizeof (tmp_path), "%s.part", cache_path);
                         FILE *out = fopen (tmp_path, "w+b");
@@ -1113,17 +1285,24 @@ fetcher_thread (void *none)
 
                     if (files_count > 0) {
                         trace ("found cover for %s - %s in local folder\n", param->artist, param->album);
-                        if (check_dir (path, 0755)) {
-                            strcat (path, "/");
-                            strcat (path, files[0]->d_name);
-                            char cache_path[1024];
-                            char tmp_path[1024];
-                            make_cache_path (cache_path, sizeof (cache_path), param->album, param->artist, -1);
+                        strcat (path, "/");
+                        strcat (path, files[0]->d_name);
+                        char cache_path[PATH_MAX];
+                        char tmp_path[PATH_MAX];
+                        char cache_path_dir[PATH_MAX];
+                        make_cache_path2 (cache_path, sizeof (cache_path), param->fname, param->album, param->artist, -1);
+                        strcpy (cache_path_dir, cache_path);
+                        char *slash = strrchr (cache_path_dir, '/');
+                        if (slash) {
+                            *slash = 0;
+                        }
+                        trace ("check_dir: %s\n", cache_path_dir);
+                        if (check_dir (cache_path_dir, 0755)) {
                             snprintf (tmp_path, sizeof (tmp_path), "%s.part", cache_path);
                             copy_file (path, tmp_path, -1);
                             int err = rename (tmp_path, cache_path);
                             if (err != 0) {
-                                trace ("Failed to move %s to %s: %s\n", tmp_path, cache_path, strerror (err));
+                                trace ("artwork: rename error %d: failed to move %s to %s: %s\n", err, tmp_path, cache_path, strerror (err));
                                 unlink (tmp_path);
                             }
                             int i;
@@ -1136,6 +1315,7 @@ fetcher_thread (void *none)
                 }
             }
 
+#ifdef USE_VFS_CURL
             if (!got_pic) {
                 if (artwork_enable_wos) {
 
@@ -1164,6 +1344,7 @@ fetcher_thread (void *none)
                     got_pic = 1;
                 }
             }
+#endif
 
             if (got_pic) {
                 trace ("downloaded art for %s %s\n", param->album, param->artist);
@@ -1176,7 +1357,7 @@ fetcher_thread (void *none)
                         continue;
                     }
                     char scaled_path[1024];
-                    make_cache_path (scaled_path, sizeof (scaled_path), param->album, param->artist, param->size);
+                    make_cache_path2 (scaled_path, sizeof (scaled_path), param->fname, param->album, param->artist, param->size);
                     copy_file (cache_path, scaled_path, param->size);
                 }
                 for (int i = 0; i < param->numcb; i++) {
@@ -1212,7 +1393,7 @@ find_image (const char *path) {
         // invalidate cache every 2 days
         if ((cache_period > 0 && (tm - stat_buf.st_mtime > cache_period * 60 * 60))
                 || artwork_reset_time > stat_buf.st_mtime) {
-            trace ("reloading cached file %s\n", path);
+            trace ("deleting cached file %s\n", path);
             unlink (path);
             return NULL;
         }
@@ -1222,36 +1403,12 @@ find_image (const char *path) {
     return NULL;
 }
 
-char*
+static char*
 get_album_art (const char *fname, const char *artist, const char *album, int size, artwork_callback callback, void *user_data)
 {
     char path [1024];
 
-    if (!album) {
-        album = "";
-    }
-    if (!artist) {
-        artist = "";
-    }
-
-    if (!*artist || !*album)
-    {
-        trace ("artist or album is empty, give up\n");
-        //give up
-        if (callback) {
-            callback (NULL, NULL, NULL, user_data);
-        }
-        return NULL;
-    }
-
-    if (!deadbeef->is_local_file (fname)) {
-        if (callback) {
-            callback (NULL, NULL, NULL, user_data);
-        }
-        return NULL;
-    }
-
-    make_cache_path (path, sizeof (path), album, artist, size);
+    make_cache_path2 (path, sizeof (path), fname, album, artist, size);
     char *p = find_image (path);
     if (p) {
         if (callback) {
@@ -1263,7 +1420,7 @@ get_album_art (const char *fname, const char *artist, const char *album, int siz
     if (size != -1) {
         // check if we have unscaled image
         char unscaled_path[1024];
-        make_cache_path (unscaled_path, sizeof (unscaled_path), album, artist, -1);
+        make_cache_path2 (unscaled_path, sizeof (unscaled_path), fname, album, artist, -1);
         p = find_image (unscaled_path);
         if (p) {
             free (p);
@@ -1313,13 +1470,7 @@ get_album_art_sync (const char *fname, const char *artist, const char *album, in
     return image_fname;
 }
 
-DB_plugin_t *
-artwork_load (DB_functions_t *api) {
-    deadbeef = api;
-    return DB_PLUGIN (&plugin);
-}
-
-void
+static void
 artwork_reset (int fast) {
     if (fast) {
 //        if (current_file) {
@@ -1358,25 +1509,31 @@ static int
 artwork_configchanged (void) {
     int new_artwork_enable_embedded = deadbeef->conf_get_int ("artwork.enable_embedded", 1);
     int new_artwork_enable_local = deadbeef->conf_get_int ("artwork.enable_localfolder", 1);
+#ifdef USE_VFS_CURL
     int new_artwork_enable_lfm = deadbeef->conf_get_int ("artwork.enable_lastfm", 0);
     int new_artwork_enable_aao = deadbeef->conf_get_int ("artwork.enable_albumartorg", 0);
     int new_artwork_enable_wos = deadbeef->conf_get_int ("artwork.enable_wos", 0);
+#endif
 
     char new_artwork_filemask[200];
     deadbeef->conf_get_str ("artwork.filemask", DEFAULT_FILEMASK, new_artwork_filemask, sizeof (new_artwork_filemask));
 
     if (new_artwork_enable_embedded != artwork_enable_embedded
             || new_artwork_enable_local != artwork_enable_local
+#ifdef USE_VFS_CURL
             || new_artwork_enable_lfm != artwork_enable_lfm
             || new_artwork_enable_aao != artwork_enable_aao
             || new_artwork_enable_wos != artwork_enable_wos
+#endif
             || strcmp (new_artwork_filemask, artwork_filemask)) {
         trace ("artwork config changed, invalidating cache...\n");
         artwork_enable_embedded = new_artwork_enable_embedded;
         artwork_enable_local = new_artwork_enable_local;
+#ifdef USE_VFS_CURL
         artwork_enable_lfm = new_artwork_enable_lfm;
         artwork_enable_aao = new_artwork_enable_aao;
         artwork_enable_wos = new_artwork_enable_wos;
+#endif
         artwork_reset_time = time (NULL);
         strcpy (artwork_filemask, new_artwork_filemask);
         deadbeef->conf_set_int64 ("artwork.cache_reset_time", artwork_reset_time);
@@ -1413,8 +1570,11 @@ artwork_plugin_start (void)
 
     artwork_enable_embedded = deadbeef->conf_get_int ("artwork.enable_embedded", 1);
     artwork_enable_local = deadbeef->conf_get_int ("artwork.enable_localfolder", 1);
+#ifdef USE_VFS_CURL
     artwork_enable_lfm = deadbeef->conf_get_int ("artwork.enable_lastfm", 0);
     artwork_enable_aao = deadbeef->conf_get_int ("artwork.enable_albumartorg", 0);
+    artwork_enable_wos = deadbeef->conf_get_int ("artwork.enable_wos", 0);
+#endif
     artwork_reset_time = deadbeef->conf_get_int64 ("artwork.cache_reset_time", 0);
 
     deadbeef->conf_get_str ("artwork.filemask", DEFAULT_FILEMASK, artwork_filemask, sizeof (artwork_filemask));
@@ -1471,9 +1631,11 @@ static const char settings_dlg[] =
     "property \"Fetch from embedded tags\" checkbox artwork.enable_embedded 1;\n"
     "property \"Fetch from local folder\" checkbox artwork.enable_localfolder 1;\n"
     "property \"Local cover file mask\" entry artwork.filemask \"" DEFAULT_FILEMASK "\";\n"
+#ifdef USE_VFS_CURL
     "property \"Fetch from last.fm\" checkbox artwork.enable_lastfm 0;\n"
     "property \"Fetch from albumart.org\" checkbox artwork.enable_albumartorg 0;\n"
     "property \"Fetch from worldofspectrum.org (AY only)\" checkbox artwork.enable_wos 0;\n"
+#endif
     "property \"Scale artwork towards longer side\" checkbox artwork.scale_towards_longer 1;\n"
 ;
 
@@ -1482,28 +1644,33 @@ static DB_artwork_plugin_t plugin = {
     .plugin.plugin.api_vmajor = 1,
     .plugin.plugin.api_vminor = 0,
     .plugin.plugin.version_major = 1,
-    .plugin.plugin.version_minor = 1,
+    .plugin.plugin.version_minor = 2,
     .plugin.plugin.type = DB_PLUGIN_MISC,
     .plugin.plugin.id = "artwork",
     .plugin.plugin.name = "Album Artwork",
     .plugin.plugin.descr = "Loads album artwork either from local directories or from internet",
-    .plugin.plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+    .plugin.plugin.copyright =
+        "Album Art plugin for DeaDBeeF\n"
         "Copyright (C) 2009-2011 Viktor Semykin <thesame.ml at gmail.com>\n"
+        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "\n"
+        "This software is provided 'as-is', without any express or implied\n"
+        "warranty.  In no event will the authors be held liable for any damages\n"
+        "arising from the use of this software.\n"
+        "\n"
+        "Permission is granted to anyone to use this software for any purpose,\n"
+        "including commercial applications, and to alter it and redistribute it\n"
+        "freely, subject to the following restrictions:\n"
         "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "1. The origin of this software must not be misrepresented; you must not\n"
+        " claim that you wrote the original software. If you use this software\n"
+        " in a product, an acknowledgment in the product documentation would be\n"
+        " appreciated but is not required.\n"
         "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
+        "2. Altered source versions must be plainly marked as such, and must not be\n"
+        " misrepresented as being the original software.\n"
         "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "3. This notice may not be removed or altered from any source distribution.\n"
     ,
     .plugin.plugin.website = "http://deadbeef.sf.net",
     .plugin.plugin.start = artwork_plugin_start,
@@ -1515,4 +1682,12 @@ static DB_artwork_plugin_t plugin = {
     .get_default_cover = get_default_cover,
     .get_album_art_sync = get_album_art_sync,
     .make_cache_path = make_cache_path,
+    .make_cache_path2 = make_cache_path2,
 };
+
+DB_plugin_t *
+artwork_load (DB_functions_t *api) {
+    deadbeef = api;
+    return DB_PLUGIN (&plugin);
+}
+
diff --git a/plugins/artwork/artwork.h b/plugins/artwork/artwork.h
index 9d8a2a7..f4b278e 100644
--- a/plugins/artwork/artwork.h
+++ b/plugins/artwork/artwork.h
@@ -1,3 +1,26 @@
+/*
+    Album Art plugin for DeaDBeeF
+    Copyright (C) 2009-2011 Viktor Semykin <thesame.ml at gmail.com>
+    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
 #ifndef __ARTWORK_H
 #define __ARTWORK_H
 
@@ -23,7 +46,11 @@ typedef struct {
     char* (*get_album_art_sync) (const char *fname, const char *artist, const char *album, int size);
 
     // creates full path string for cache storage
+    // NOTE: this function is deprecated, please use make_cache_path2
     void (*make_cache_path) (char *path, int size, const char *album, const char *artist, int img_size);
+
+    // creates full path string for cache storage
+    int (*make_cache_path2) (char *path, int size, const char *fname, const char *album, const char *artist, int img_size);
 } DB_artwork_plugin_t;
 
 #endif /*__ARTWORK_H*/
diff --git a/plugins/artwork/escape.h b/plugins/artwork/escape.h
index a8086a8..bd76f4d 100644
--- a/plugins/artwork/escape.h
+++ b/plugins/artwork/escape.h
@@ -1,20 +1,24 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2014 Alexey Yakovenko and other contributors
 
-    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.
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
 #ifndef __ESCAPE_H
 #define __ESCAPE_H
diff --git a/plugins/artwork/lastfm.c b/plugins/artwork/lastfm.c
index 5b5cedd..83bda9c 100644
--- a/plugins/artwork/lastfm.c
+++ b/plugins/artwork/lastfm.c
@@ -1,3 +1,26 @@
+/*
+    Album Art plugin for DeaDBeeF
+    Copyright (C) 2009-2011 Viktor Semykin <thesame.ml at gmail.com>
+    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
@@ -22,11 +45,17 @@ int
 fetch_from_lastfm (const char *artist, const char *album, const char *dest)
 {
     char url [1024];
-    char *artist_url = uri_escape (artist, 0);
-    char *album_url = uri_escape (album, 0);
+    char *artist_url = NULL;
+    char *album_url = NULL;
+
+retry:
+    artist_url = uri_escape (artist, 0);
+    album_url = uri_escape (album, 0);
     snprintf (url, sizeof (url), BASE_URL "?method=album.getinfo&api_key=" API_KEY "&artist=%s&album=%s", artist_url, album_url);
     free (artist_url);
+    artist_url = NULL;
     free (album_url);
+    album_url = NULL;
 
     DB_FILE *fp = deadbeef->fopen (url);
     if (!fp) {
@@ -55,6 +84,11 @@ fetch_from_lastfm (const char *artist, const char *album, const char *dest)
 
     char *end = strstr (img, "</image>");
     if (!end || end == img) {
+        if (artist != album) {
+            artist = album;
+            goto retry;
+        }
+
         trace ("fetch_from_lastfm: bad xml (or image not found) from %s\n", url);
         return -1;
     }
diff --git a/plugins/artwork/lastfm.h b/plugins/artwork/lastfm.h
index b11ca37..e6fc82b 100644
--- a/plugins/artwork/lastfm.h
+++ b/plugins/artwork/lastfm.h
@@ -1,20 +1,25 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    Album Art plugin for DeaDBeeF
+    Copyright (C) 2009-2011 Viktor Semykin <thesame.ml at gmail.com>
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
 #ifndef __LASTFM_H
 #define __LASTFM_H
diff --git a/plugins/cdda/COPYING b/plugins/cdda/COPYING
new file mode 100644
index 0000000..cf6220b
--- /dev/null
+++ b/plugins/cdda/COPYING
@@ -0,0 +1,55 @@
+CD audio plugin for DeaDBeeF
+Copyright (C) 2009-2014 Alexey Yakovenko, Viktor Semykin
+
+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, see <http://www.gnu.org/licenses/>.
+
+
+libcddb
+Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne at advalvas.be>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the
+Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA  02111-1307, USA.
+
+
+
+libcdio
+Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Rocky Bernstein <rocky at gnu.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 3 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, see <http://www.gnu.org/licenses/>.
+
+
+
diff --git a/plugins/cdda/Makefile.am b/plugins/cdda/Makefile.am
index fd5be95..5d56cf4 100644
--- a/plugins/cdda/Makefile.am
+++ b/plugins/cdda/Makefile.am
@@ -2,7 +2,7 @@ if HAVE_CDDA
 cddadir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = cdda.la
 cdda_la_SOURCES = cdda.c
-cdda_la_LDFLAGS = -module
+cdda_la_LDFLAGS = -module -avoid-version
 
 cdda_la_LIBADD = $(LDADD) $(CDDA_LIBS)
 AM_CFLAGS = $(CFLAGS) -std=c99 $(CDDA_CFLAGS)
diff --git a/plugins/cdda/Makefile.in b/plugins/cdda/Makefile.in
index 8e804af..4a8972d 100644
--- a/plugins/cdda/Makefile.in
+++ b/plugins/cdda/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/cdda
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -114,23 +142,48 @@ am__DEPENDENCIES_1 =
 am__cdda_la_SOURCES_DIST = cdda.c
 @HAVE_CDDA_TRUE at am_cdda_la_OBJECTS = cdda.lo
 cdda_la_OBJECTS = $(am_cdda_la_OBJECTS)
-cdda_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(cdda_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+cdda_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(cdda_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_CDDA_TRUE at am_cdda_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(cdda_la_SOURCES)
 DIST_SOURCES = $(am__cdda_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,6 +191,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,6 +234,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -184,10 +255,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -210,6 +283,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -263,6 +337,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -281,6 +356,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -306,13 +383,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -321,7 +402,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -382,7 +465,7 @@ top_srcdir = @top_srcdir@
 @HAVE_CDDA_TRUE at cddadir = $(libdir)/$(PACKAGE)
 @HAVE_CDDA_TRUE at pkglib_LTLIBRARIES = cdda.la
 @HAVE_CDDA_TRUE at cdda_la_SOURCES = cdda.c
- at HAVE_CDDA_TRUE@cdda_la_LDFLAGS = -module
+ at HAVE_CDDA_TRUE@cdda_la_LDFLAGS = -module -avoid-version
 @HAVE_CDDA_TRUE at cdda_la_LIBADD = $(LDADD) $(CDDA_LIBS)
 @HAVE_CDDA_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 $(CDDA_CFLAGS)
 all: all-am
@@ -419,6 +502,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -445,14 +529,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 cdda.la: $(cdda_la_OBJECTS) $(cdda_la_DEPENDENCIES) $(EXTRA_cdda_la_DEPENDENCIES) 
-	$(cdda_la_LINK) $(am_cdda_la_rpath) $(cdda_la_OBJECTS) $(cdda_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(cdda_la_LINK) $(am_cdda_la_rpath) $(cdda_la_OBJECTS) $(cdda_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -463,25 +550,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cdda.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,26 +576,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +596,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +609,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -681,19 +768,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/cdda/cdda.c b/plugins/cdda/cdda.c
index 6f4233b..a25f8ea 100644
--- a/plugins/cdda/cdda.c
+++ b/plugins/cdda/cdda.c
@@ -644,7 +644,7 @@ cda_action_add_cd (DB_plugin_action_t *act, int ctx)
 
 static DB_plugin_action_t add_cd_action = {
     .name = "cd_add",
-    .title = "File/Add audio CD",
+    .title = "File/Add Audio CD",
     .flags = DB_ACTION_COMMON | DB_ACTION_ADD_MENU,
     .callback2 = cda_action_add_cd,
     .next = NULL
diff --git a/plugins/converter/COPYING b/plugins/converter/COPYING
new file mode 100644
index 0000000..0950706
--- /dev/null
+++ b/plugins/converter/COPYING
@@ -0,0 +1,17 @@
+Converter plugin for DeaDBeeF Player
+
+Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
diff --git a/plugins/converter/Makefile.am b/plugins/converter/Makefile.am
index d14d3f4..c708f9b 100644
--- a/plugins/converter/Makefile.am
+++ b/plugins/converter/Makefile.am
@@ -20,24 +20,27 @@ convdata_DATA = \
 	presets/MP3_VBR_192Kbps_(Lame).txt\
 	presets/MS_RIFF_WAV.txt\
 	presets/MusePack.txt\
+	presets/Ogg_FLAC.txt\
 	presets/Ogg_Vorbis_(-q_5).txt\
+	presets/Opus.txt\
 	presets/TTA.txt\
-	presets/WavPack.txt
+	presets/WavPack.txt\
+	presets/ALAC.txt
 
 EXTRA_DIST = $(convdata_DATA) converter.glade
 
 AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
 
 converter_la_SOURCES = converter.c converter.h
-converter_la_LDFLAGS = -module
+converter_la_LDFLAGS = -module -avoid-version
 
 if HAVE_GTK2
 converter_gtk2_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h
-converter_gtk2_la_LDFLAGS = -module
+converter_gtk2_la_LDFLAGS = -module -avoid-version
 if STATICLINK
 GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr
 
-converter_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la
+converter_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lrt
 
 converter_gtk2_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
 else
@@ -48,18 +51,9 @@ endif
 
 if HAVE_GTK3
 converter_gtk3_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h
-converter_gtk3_la_LDFLAGS = -module
-if STATICLINK
-GTK_ROOT_300=@top_srcdir@/$(LIB)/gtk-3.0.0
-
-converter_gtk3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD)
-
-converter_gtk3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS)
-
-else
+converter_gtk3_la_LDFLAGS = -module -avoid-version
 converter_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
 converter_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
 endif
-endif
 
 endif
diff --git a/plugins/converter/Makefile.in b/plugins/converter/Makefile.in
index 1c0eeb6..f5d7bbb 100644
--- a/plugins/converter/Makefile.in
+++ b/plugins/converter/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,23 +16,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,7 +80,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/converter
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -114,7 +142,11 @@ converter_la_LIBADD =
 am__converter_la_SOURCES_DIST = converter.c converter.h
 @HAVE_CONVERTER_TRUE at am_converter_la_OBJECTS = converter.lo
 converter_la_OBJECTS = $(am_converter_la_OBJECTS)
-converter_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+converter_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(converter_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE at am_converter_la_rpath =  \
@@ -128,25 +160,14 @@ converter_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@	$(pkglibdir)
 am__DEPENDENCIES_1 =
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_FALSE at converter_gtk2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- at HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE at converter_gtk2_la_DEPENDENCIES = $(GTK_ROOT)/lib/libgtk-x11-2.0.la \
- at HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgdk-x11-2.0.la \
- at HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libpangoft2-1.0.la \
- at HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libpangocairo-1.0.la \
- at HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la \
- at HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libcairo.la \
- at HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libpango-1.0.la \
- at HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgobject-2.0.la \
- at HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgmodule-2.0.la \
- at HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgthread-2.0.la \
- at HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libglib-2.0.la
 am__converter_gtk2_la_SOURCES_DIST = convgui.c interface.c support.c \
 	callbacks.h converter.h interface.h support.h
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE at am_converter_gtk2_la_OBJECTS = converter_gtk2_la-convgui.lo \
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@	converter_gtk2_la-interface.lo \
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@	converter_gtk2_la-support.lo
 converter_gtk2_la_OBJECTS = $(am_converter_gtk2_la_OBJECTS)
-converter_gtk2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+converter_gtk2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(converter_gtk2_la_CFLAGS) $(CFLAGS) \
 	$(converter_gtk2_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE at am_converter_gtk2_la_rpath =  \
@@ -155,15 +176,16 @@ converter_gtk2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE at am_converter_gtk2_la_rpath =  \
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@	-rpath \
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@	$(pkglibdir)
- at HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE at converter_gtk3_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ at HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE at converter_gtk3_la_DEPENDENCIES =  \
+ at HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@	$(am__DEPENDENCIES_1)
 am__converter_gtk3_la_SOURCES_DIST = convgui.c interface.c support.c \
 	callbacks.h converter.h interface.h support.h
 @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE at am_converter_gtk3_la_OBJECTS = converter_gtk3_la-convgui.lo \
 @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@	converter_gtk3_la-interface.lo \
 @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@	converter_gtk3_la-support.lo
 converter_gtk3_la_OBJECTS = $(am_converter_gtk3_la_OBJECTS)
-converter_gtk3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+converter_gtk3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(converter_gtk3_la_CFLAGS) $(CFLAGS) \
 	$(converter_gtk3_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE at am_converter_gtk3_la_rpath =  \
@@ -172,19 +194,40 @@ converter_gtk3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE at am_converter_gtk3_la_rpath =  \
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@	-rpath \
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@	$(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(converter_la_SOURCES) $(converter_gtk2_la_SOURCES) \
 	$(converter_gtk3_la_SOURCES)
 DIST_SOURCES = $(am__converter_la_SOURCES_DIST) \
@@ -196,6 +239,23 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 DATA = $(convdata_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -222,6 +282,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -242,10 +303,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -268,6 +331,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -321,6 +385,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -339,6 +404,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -364,13 +431,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -379,7 +450,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -448,28 +521,28 @@ top_srcdir = @top_srcdir@
 @HAVE_CONVERTER_TRUE@	presets/MP3_VBR_192Kbps_(Lame).txt\
 @HAVE_CONVERTER_TRUE@	presets/MS_RIFF_WAV.txt\
 @HAVE_CONVERTER_TRUE@	presets/MusePack.txt\
+ at HAVE_CONVERTER_TRUE@	presets/Ogg_FLAC.txt\
 @HAVE_CONVERTER_TRUE@	presets/Ogg_Vorbis_(-q_5).txt\
+ at HAVE_CONVERTER_TRUE@	presets/Opus.txt\
 @HAVE_CONVERTER_TRUE@	presets/TTA.txt\
- at HAVE_CONVERTER_TRUE@	presets/WavPack.txt
+ at HAVE_CONVERTER_TRUE@	presets/WavPack.txt\
+ at HAVE_CONVERTER_TRUE@	presets/ALAC.txt
 
 @HAVE_CONVERTER_TRUE at EXTRA_DIST = $(convdata_DATA) converter.glade
 @HAVE_CONVERTER_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
 @HAVE_CONVERTER_TRUE at converter_la_SOURCES = converter.c converter.h
- at HAVE_CONVERTER_TRUE@converter_la_LDFLAGS = -module
+ at HAVE_CONVERTER_TRUE@converter_la_LDFLAGS = -module -avoid-version
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE at converter_gtk2_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h
- at HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE at converter_gtk2_la_LDFLAGS = -module
+ at HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE at converter_gtk2_la_LDFLAGS = -module -avoid-version
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE at GTK_ROOT = @top_srcdir@/$(LIB)/gtk-2.12.12/usr
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_FALSE at converter_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS)
- at HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE at converter_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la
+ at HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE at converter_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lrt
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_FALSE at converter_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS)
 @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE at converter_gtk2_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
 @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE at converter_gtk3_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h
- at HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE at converter_gtk3_la_LDFLAGS = -module
- at HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at GTK_ROOT_300 = @top_srcdir@/$(LIB)/gtk-3.0.0
- at HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE at converter_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
- at HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at converter_gtk3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD)
- at HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE at converter_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
- at HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at converter_gtk3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS)
+ at HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE at converter_gtk3_la_LDFLAGS = -module -avoid-version
+ at HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE at converter_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
+ at HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE at converter_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
 all: all-am
 
 .SUFFIXES:
@@ -504,6 +577,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -530,18 +604,23 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 converter.la: $(converter_la_OBJECTS) $(converter_la_DEPENDENCIES) $(EXTRA_converter_la_DEPENDENCIES) 
-	$(converter_la_LINK) $(am_converter_la_rpath) $(converter_la_OBJECTS) $(converter_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(converter_la_LINK) $(am_converter_la_rpath) $(converter_la_OBJECTS) $(converter_la_LIBADD) $(LIBS)
+
 converter_gtk2.la: $(converter_gtk2_la_OBJECTS) $(converter_gtk2_la_DEPENDENCIES) $(EXTRA_converter_gtk2_la_DEPENDENCIES) 
-	$(converter_gtk2_la_LINK) $(am_converter_gtk2_la_rpath) $(converter_gtk2_la_OBJECTS) $(converter_gtk2_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(converter_gtk2_la_LINK) $(am_converter_gtk2_la_rpath) $(converter_gtk2_la_OBJECTS) $(converter_gtk2_la_LIBADD) $(LIBS)
+
 converter_gtk3.la: $(converter_gtk3_la_OBJECTS) $(converter_gtk3_la_DEPENDENCIES) $(EXTRA_converter_gtk3_la_DEPENDENCIES) 
-	$(converter_gtk3_la_LINK) $(am_converter_gtk3_la_rpath) $(converter_gtk3_la_OBJECTS) $(converter_gtk3_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(converter_gtk3_la_LINK) $(am_converter_gtk3_la_rpath) $(converter_gtk3_la_OBJECTS) $(converter_gtk3_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -558,67 +637,67 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/converter_gtk3_la-support.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 converter_gtk2_la-convgui.lo: convgui.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -MT converter_gtk2_la-convgui.lo -MD -MP -MF $(DEPDIR)/converter_gtk2_la-convgui.Tpo -c -o converter_gtk2_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/converter_gtk2_la-convgui.Tpo $(DEPDIR)/converter_gtk2_la-convgui.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='convgui.c' object='converter_gtk2_la-convgui.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -MT converter_gtk2_la-convgui.lo -MD -MP -MF $(DEPDIR)/converter_gtk2_la-convgui.Tpo -c -o converter_gtk2_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk2_la-convgui.Tpo $(DEPDIR)/converter_gtk2_la-convgui.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='convgui.c' object='converter_gtk2_la-convgui.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -c -o converter_gtk2_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -c -o converter_gtk2_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
 
 converter_gtk2_la-interface.lo: interface.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -MT converter_gtk2_la-interface.lo -MD -MP -MF $(DEPDIR)/converter_gtk2_la-interface.Tpo -c -o converter_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/converter_gtk2_la-interface.Tpo $(DEPDIR)/converter_gtk2_la-interface.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interface.c' object='converter_gtk2_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -MT converter_gtk2_la-interface.lo -MD -MP -MF $(DEPDIR)/converter_gtk2_la-interface.Tpo -c -o converter_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk2_la-interface.Tpo $(DEPDIR)/converter_gtk2_la-interface.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='interface.c' object='converter_gtk2_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -c -o converter_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -c -o converter_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
 
 converter_gtk2_la-support.lo: support.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -MT converter_gtk2_la-support.lo -MD -MP -MF $(DEPDIR)/converter_gtk2_la-support.Tpo -c -o converter_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/converter_gtk2_la-support.Tpo $(DEPDIR)/converter_gtk2_la-support.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='support.c' object='converter_gtk2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -MT converter_gtk2_la-support.lo -MD -MP -MF $(DEPDIR)/converter_gtk2_la-support.Tpo -c -o converter_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk2_la-support.Tpo $(DEPDIR)/converter_gtk2_la-support.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='support.c' object='converter_gtk2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -c -o converter_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -c -o converter_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
 
 converter_gtk3_la-convgui.lo: convgui.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -MT converter_gtk3_la-convgui.lo -MD -MP -MF $(DEPDIR)/converter_gtk3_la-convgui.Tpo -c -o converter_gtk3_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/converter_gtk3_la-convgui.Tpo $(DEPDIR)/converter_gtk3_la-convgui.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='convgui.c' object='converter_gtk3_la-convgui.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -MT converter_gtk3_la-convgui.lo -MD -MP -MF $(DEPDIR)/converter_gtk3_la-convgui.Tpo -c -o converter_gtk3_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk3_la-convgui.Tpo $(DEPDIR)/converter_gtk3_la-convgui.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='convgui.c' object='converter_gtk3_la-convgui.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -c -o converter_gtk3_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -c -o converter_gtk3_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
 
 converter_gtk3_la-interface.lo: interface.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -MT converter_gtk3_la-interface.lo -MD -MP -MF $(DEPDIR)/converter_gtk3_la-interface.Tpo -c -o converter_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/converter_gtk3_la-interface.Tpo $(DEPDIR)/converter_gtk3_la-interface.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interface.c' object='converter_gtk3_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -MT converter_gtk3_la-interface.lo -MD -MP -MF $(DEPDIR)/converter_gtk3_la-interface.Tpo -c -o converter_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk3_la-interface.Tpo $(DEPDIR)/converter_gtk3_la-interface.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='interface.c' object='converter_gtk3_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -c -o converter_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -c -o converter_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
 
 converter_gtk3_la-support.lo: support.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -MT converter_gtk3_la-support.lo -MD -MP -MF $(DEPDIR)/converter_gtk3_la-support.Tpo -c -o converter_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/converter_gtk3_la-support.Tpo $(DEPDIR)/converter_gtk3_la-support.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='support.c' object='converter_gtk3_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -MT converter_gtk3_la-support.lo -MD -MP -MF $(DEPDIR)/converter_gtk3_la-support.Tpo -c -o converter_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk3_la-support.Tpo $(DEPDIR)/converter_gtk3_la-support.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='support.c' object='converter_gtk3_la-support.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -c -o converter_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -c -o converter_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -647,26 +726,15 @@ uninstall-convdataDATA:
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(convdatadir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -678,15 +746,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -695,6 +759,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -839,20 +918,21 @@ uninstall-am: uninstall-convdataDATA uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-convdataDATA install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pkglibLTLIBRARIES install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-convdataDATA uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-convdataDATA \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-pkglibLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-convdataDATA \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/converter/converter.c b/plugins/converter/converter.c
index 17be303..f87f3f2 100644
--- a/plugins/converter/converter.c
+++ b/plugins/converter/converter.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -32,6 +32,7 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <inttypes.h>
 #include "converter.h"
 #include "../../deadbeef.h"
 #include "../../strdupa.h"
@@ -167,7 +168,7 @@ encoder_preset_save (ddb_encoder_preset_t *p, int overwrite) {
         return -1;
     }
     const char *confdir = deadbeef->get_config_dir ();
-    char path[1024];
+    char path[PATH_MAX];
     if (snprintf (path, sizeof (path), "%s/presets", confdir) < 0) {
         return -1;
     }
@@ -371,7 +372,7 @@ dsp_preset_save (ddb_dsp_preset_t *p, int overwrite) {
         return -1;
     }
     const char *confdir = deadbeef->get_config_dir ();
-    char path[1024];
+    char path[PATH_MAX];
     if (snprintf (path, sizeof (path), "%s/presets", confdir) < 0) {
         return -1;
     }
@@ -458,77 +459,69 @@ copy_file (const char *in, const char *out) {
 int
 load_encoder_presets (void) {
     // check if we need to install presets
-    char ppath[1024];
-    char epath[1024];
-    char fpath[1024];
+    char ppath[PATH_MAX];
+    char epath[PATH_MAX];
     snprintf (ppath, sizeof (ppath), "%s/presets", deadbeef->get_config_dir ());
     snprintf (epath, sizeof (epath), "%s/encoders", ppath);
-    snprintf (fpath, sizeof (fpath), "%s/.installed", epath);
-    struct stat stat_buf;
-    if (0 != stat (fpath, &stat_buf)) {
-        // file not found, install all presets from plugin_dir/convpresets/
-        mkdir (ppath, 0755);
-        mkdir (epath, 0755);
-        char preset_src_dir[1024];
-        snprintf (preset_src_dir, sizeof (preset_src_dir), "%s/convpresets", deadbeef->get_plugin_dir ());
-        struct dirent **namelist = NULL;
-        int n = scandir (preset_src_dir, &namelist, NULL, dirent_alphasort);
-        for (int i = 0; i < n; i++) {
-            // replace _ with spaces
-            char new_name[1024];
-            char *o = new_name;
-            char *in = namelist[i]->d_name;
-            while (*in) {
-                if (*in == '_') {
-                    *o++ = ' ';
-                    in++;
-                }
-                else {
-                    *o++ = *in++;
-                }
-            }
-            *o = 0;
-            char in_name[1024];
-            char out_name[1024];
-            snprintf (in_name, sizeof (in_name), "%s/%s", preset_src_dir, namelist[i]->d_name);
-            snprintf (out_name, sizeof (out_name), "%s/%s", epath, new_name);
-            copy_file (in_name, out_name);
-            free (namelist[i]);
-        }
-        if (namelist) {
-            free (namelist);
-        }
-        FILE *fp = fopen (fpath, "w+b");
-        if (fp) {
-            fclose (fp);
-        }
-    }
 
-    ddb_encoder_preset_t *tail = NULL;
-    char path[1024];
+    char path[PATH_MAX];
     if (snprintf (path, sizeof (path), "%s/presets/encoders", deadbeef->get_config_dir ()) < 0) {
         return -1;
     }
-    struct dirent **namelist = NULL;
-    int n = scandir (path, &namelist, scandir_preset_filter, dirent_alphasort);
-    int i;
-    for (i = 0; i < n; i++) {
-        char s[1024];
-        if (snprintf (s, sizeof (s), "%s/%s", path, namelist[i]->d_name) > 0){
-            ddb_encoder_preset_t *p = encoder_preset_load (s);
-            if (p) {
-                if (tail) {
-                    tail->next = p;
-                    tail = p;
-                }
-                else {
-                    encoder_presets = tail = p;
+
+    char syspath[PATH_MAX];
+    if (snprintf (syspath, sizeof (syspath), "%s/convpresets", deadbeef->get_plugin_dir ()) < 0) {
+        return -1;
+    }
+
+    const char *preset_dirs[] = {
+        syspath, path, NULL
+    };
+
+    ddb_encoder_preset_t *tail = NULL;
+
+    for (int di = 0; preset_dirs[di]; di++) {
+        const char *path = preset_dirs[di];
+        struct dirent **namelist = NULL;
+        int n = scandir (path, &namelist, scandir_preset_filter, dirent_alphasort);
+        int i;
+        for (i = 0; i < n; i++) {
+            char s[PATH_MAX];
+            if (snprintf (s, sizeof (s), "%s/%s", path, namelist[i]->d_name) > 0){
+                ddb_encoder_preset_t *p = encoder_preset_load (s);
+                if (p) {
+                    if (path == syspath) {
+                        // don't allow editing stock presets
+                        p->readonly = 1;
+                    }
+                    else {
+                        // check if the same RO preset exists
+                        for (ddb_encoder_preset_t *pr = encoder_presets; pr; pr = pr->next) {
+                            if (pr->readonly && !strcmp (pr->title, p->title)) {
+                                encoder_preset_free (p);
+                                p = NULL;
+                                break;
+                            }
+                        }
+                        if (!p) {
+                            // NOTE: we don't delete duplicate presets in $HOME
+                            // for compat with <=0.6.1
+                            continue;
+                        }
+                    }
+                    if (tail) {
+                        tail->next = p;
+                        tail = p;
+                    }
+                    else {
+                        encoder_presets = tail = p;
+                    }
                 }
             }
+            free (namelist[i]);
         }
-        free (namelist[i]);
+        free (namelist);
     }
-    free (namelist);
     return 0;
 }
 
@@ -555,7 +548,7 @@ free_encoder_presets (void) {
 int
 load_dsp_presets (void) {
     ddb_dsp_preset_t *tail = NULL;
-    char path[1024];
+    char path[PATH_MAX];
     if (snprintf (path, sizeof (path), "%s/presets/dsp", deadbeef->get_config_dir ()) < 0) {
         return -1;
     }
@@ -563,7 +556,7 @@ load_dsp_presets (void) {
     int n = scandir (path, &namelist, scandir_preset_filter, dirent_alphasort);
     int i;
     for (i = 0; i < n; i++) {
-        char s[1024];
+        char s[PATH_MAX];
         if (snprintf (s, sizeof (s), "%s/%s", path, namelist[i]->d_name) > 0){
             ddb_dsp_preset_t *p = dsp_preset_load (s);
             if (p) {
@@ -802,6 +795,8 @@ check_dir (const char *dir, mode_t mode)
 
 int
 convert (DB_playItem_t *it, const char *out, int output_bps, int output_is_float, ddb_encoder_preset_t *encoder_preset, ddb_dsp_preset_t *dsp_preset, int *abort) {
+    char *buffer = NULL;
+    char *dspbuffer = NULL;
     if (deadbeef->pl_get_item_duration (it) <= 0) {
         deadbeef->pl_lock ();
         fprintf (stderr, "converter: stream %s doesn't have finite length, skipped\n", deadbeef->pl_find_meta (it, ":URI"));
@@ -927,10 +922,10 @@ convert (DB_playItem_t *it, const char *out, int output_bps, int output_is_float
 
             // write wave header
             char wavehdr_int[] = {
-                0x52, 0x49, 0x46, 0x46, 0x24, 0x70, 0x0d, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x44, 0xac, 0x00, 0x00, 0x10, 0xb1, 0x02, 0x00, 0x04, 0x00, 0x10, 0x00, 0x64, 0x61, 0x74, 0x61
+                0x52, 0x49, 0x46, 0x46, 0x00, 0x00, 0x00, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x44, 0xac, 0x00, 0x00, 0x10, 0xb1, 0x02, 0x00, 0x04, 0x00, 0x10, 0x00, 0x64, 0x61, 0x74, 0x61
             };
             char wavehdr_float[] = {
-                0x52, 0x49, 0x46, 0x46, 0x2a, 0xdf, 0x02, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x28, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x02, 0x00, 0x40, 0x1f, 0x00, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x08, 0x00, 0x20, 0x00, 0x16, 0x00, 0x20, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71, 0x66, 0x61, 0x63, 0x74, 0x04, 0x00, 0x00, 0x00, 0xc5, 0x5b, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61
+                0x52, 0x49, 0x46, 0x46, 0x00, 0x00, 0x00, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x28, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x02, 0x00, 0x40, 0x1f, 0x00, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x08, 0x00, 0x20, 0x00, 0x16, 0x00, 0x20, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71, 0x66, 0x61, 0x63, 0x74, 0x04, 0x00, 0x00, 0x00, 0xc5, 0x5b, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61
             };
             char *wavehdr = output_is_float ? wavehdr_float : wavehdr_int;
             int wavehdr_size = output_is_float ? sizeof (wavehdr_float) : sizeof (wavehdr_int);
@@ -945,9 +940,9 @@ convert (DB_playItem_t *it, const char *out, int output_bps, int output_is_float
             int bs = 2000 * samplesize;
             // expected buffer size after worst-case dsp
             int dspsize = bs/samplesize*sizeof(float)*8*48;
-            char buffer[dspsize];
+            char *buffer = malloc (dspsize);
             // account for up to float32 7.1 resampled to 48x ratio
-            char dspbuffer[dspsize];
+            char *dspbuffer = malloc (dspsize);
             int eof = 0;
             for (;;) {
                 if (eof) {
@@ -973,7 +968,7 @@ convert (DB_playItem_t *it, const char *out, int output_bps, int output_is_float
                     ddb_dsp_context_t *dsp = dsp_preset->chain;
                     int frames = sz / samplesize;
                     while (dsp) {
-                        frames = dsp->plugin->process (dsp, (float *)dspbuffer, frames, sizeof (dspbuffer) / (fmt.channels * 4), &fmt, NULL);
+                        frames = dsp->plugin->process (dsp, (float *)dspbuffer, frames, dspsize / (fmt.channels * 4), &fmt, NULL);
                         if (frames <= 0) {
                             break;
                         }
@@ -1011,9 +1006,9 @@ convert (DB_playItem_t *it, const char *out, int output_bps, int output_is_float
                 outsize += sz;
 
                 if (!header_written) {
-                    uint32_t size = (it->endsample-it->startsample) * outch * output_bps / 8;
+                    uint64_t size = (int64_t)(it->endsample-it->startsample) * outch * output_bps / 8;
                     if (!size) {
-                        size = deadbeef->pl_get_item_duration (it) * fileinfo->fmt.samplerate * outch * output_bps / 8;
+                        size = (double)deadbeef->pl_get_item_duration (it) * fileinfo->fmt.samplerate * outch * output_bps / 8;
 
                     }
 
@@ -1024,20 +1019,38 @@ convert (DB_playItem_t *it, const char *out, int output_bps, int output_is_float
                         size  = temp;
                     }
 
+                    uint64_t chunksize;
+                    chunksize = size + 40;
+
+                    // for float, add 36 more
+                    if (output_is_float) {
+                        chunksize += 36;
+                    }
+
+                    uint32_t size32 = 0xffffffff;
+                    if (chunksize <= 0xffffffff) {
+                        size32 = chunksize;
+                    }
+                    memcpy (&wavehdr[4], &size32, 4);
                     memcpy (&wavehdr[22], &outch, 2);
                     memcpy (&wavehdr[24], &outsr, 4);
                     uint16_t blockalign = outch * output_bps / 8;
                     memcpy (&wavehdr[32], &blockalign, 2);
                     memcpy (&wavehdr[34], &output_bps, 2);
 
+                    size32 = 0xffffffff;
+                    if (size <= 0xffffffff) {
+                        size32 = size;
+                    }
+
                     if (wavehdr_size != write (temp_file, wavehdr, wavehdr_size)) {
                         fprintf (stderr, "converter: wave header write error\n");
                         goto error;
                     }
                     if (encoder_preset->method == DDB_ENCODER_METHOD_PIPE) {
-                        size = 0;
+                        size32 = 0;
                     }
-                    if (write (temp_file, &size, sizeof (size)) != sizeof (size)) {
+                    if (write (temp_file, &size32, sizeof (size32)) != sizeof (size32)) {
                         fprintf (stderr, "converter: wave header size write error\n");
                         goto error;
                     }
@@ -1046,7 +1059,7 @@ convert (DB_playItem_t *it, const char *out, int output_bps, int output_is_float
 
                 int64_t res = write (temp_file, buffer, sz);
                 if (sz != res) {
-                    fprintf (stderr, "converter: write error (%lld bytes written out of %d)\n", res, sz);
+                    fprintf (stderr, "converter: write error (%"PRId64" bytes written out of %d)\n", res, sz);
                     goto error;
                 }
             }
@@ -1073,6 +1086,14 @@ convert (DB_playItem_t *it, const char *out, int output_bps, int output_is_float
     }
     err = 0;
 error:
+    if (buffer) {
+        free (buffer);
+        buffer = NULL;
+    }
+    if (dspbuffer) {
+        free (dspbuffer);
+        dspbuffer = NULL;
+    }
     if (temp_file != -1 && (!enc_pipe || temp_file != fileno (enc_pipe))) {
         close (temp_file);
         temp_file = -1;
@@ -1113,8 +1134,16 @@ error:
             *o++ = *p++;
         }
         *o = 0;
+        deadbeef->pl_set_item_flags (out_it, 0);
+        DB_metaInfo_t *m = deadbeef->pl_get_metadata_head (out_it);
+        while (m) {
+            DB_metaInfo_t *next = m->next;
+            if (m->key[0] == ':' || m->key[0] == '!' || !strcasecmp (m->key, "cuesheet")) {
+                deadbeef->pl_delete_metadata (out_it, m);
+            }
+            m = next;
+        }
         deadbeef->pl_replace_meta (out_it, ":URI", unesc_path);
-        deadbeef->pl_delete_meta (out_it, "cuesheet");
     }
 
     uint32_t tagflags = 0;
@@ -1158,20 +1187,18 @@ error:
     if (encoder_preset->tag_oggvorbis) {
         // find flac decoder plugin
         DB_decoder_t **plugs = deadbeef->plug_get_decoder_list ();
-        DB_decoder_t *ogg = NULL;
+        int res = -1;
         for (int i = 0; plugs[i]; i++) {
-            if (!strcmp (plugs[i]->plugin.id, "stdogg")) {
-                ogg = plugs[i];
-                break;
+            if (!strcmp (plugs[i]->plugin.id, "stdogg")
+                    || !strcmp (plugs[i]->plugin.id, "stdopus")) {
+                res = plugs[i]->write_metadata (out_it);
+                if (!res) {
+                    break;
+                }
             }
         }
-        if (!ogg) {
-            fprintf (stderr, "converter: ogg plugin not found, cannot write ogg metadata\n");
-        }
-        else {
-            if (0 != ogg->write_metadata (out_it)) {
-                fprintf (stderr, "converter: failed to write ogg metadata, not an ogg file?\n");
-            }
+        if (res) {
+            fprintf (stderr, "converter: failed to write ogg metadata, not an ogg file?\n");
         }
     }
     if (out_it) {
@@ -1212,7 +1239,7 @@ static ddb_converter_t plugin = {
     .misc.plugin.api_vmajor = 1,
     .misc.plugin.api_vminor = 0,
     .misc.plugin.version_major = 1,
-    .misc.plugin.version_minor = 2,
+    .misc.plugin.version_minor = 3,
     .misc.plugin.type = DB_PLUGIN_MISC,
     .misc.plugin.name = "Converter",
     .misc.plugin.id = "converter",
diff --git a/plugins/converter/converter.glade b/plugins/converter/converter.glade
index 667dbcf..a5f4464 100644
--- a/plugins/converter/converter.glade
+++ b/plugins/converter/converter.glade
@@ -7,7 +7,7 @@
   <property name="visible">True</property>
   <property name="title">Converter</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="window_position">GTK_WIN_POS_MOUSE</property>
   <property name="modal">True</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">True</property>
@@ -1730,6 +1730,22 @@ Temporary file</property>
 	      </child>
 
 	      <child>
+		<widget class="GtkButton" id="copy">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label">gtk-copy</property>
+		  <property name="use_stock">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
 		<widget class="GtkButton" id="remove">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
diff --git a/plugins/converter/converter.h b/plugins/converter/converter.h
index 0adc583..ba77931 100644
--- a/plugins/converter/converter.h
+++ b/plugins/converter/converter.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -53,6 +53,9 @@ typedef struct ddb_encoder_preset_s {
     int tag_oggvorbis;
     int tag_mp3xing;
     int id3v2_version;
+
+    // added in converter-1.3
+    int readonly; // this means the preset cannot be edited
 } ddb_encoder_preset_t;
 
 typedef struct ddb_dsp_preset_s {
diff --git a/plugins/converter/convgui.c b/plugins/converter/convgui.c
index a854654..21bead7 100644
--- a/plugins/converter/convgui.c
+++ b/plugins/converter/convgui.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -41,6 +41,8 @@ DB_functions_t *deadbeef;
 ddb_converter_t *converter_plugin;
 ddb_gtkui_t *gtkui_plugin;
 
+static int converter_active;
+
 typedef struct {
     GtkWidget *converter;
     ddb_encoder_preset_t *current_encoder_preset;
@@ -65,13 +67,24 @@ typedef struct {
 
 converter_ctx_t *current_ctx;
 
-void
-fill_presets (GtkListStore *mdl, ddb_preset_t *head) {
+enum {
+    PRESET_TYPE_ENCODER,
+    PRESET_TYPE_DSP
+};
+
+static void
+fill_presets (GtkListStore *mdl, ddb_preset_t *head, int type) {
     ddb_preset_t *p = head;
     while (p) {
         GtkTreeIter iter;
         gtk_list_store_append (mdl, &iter);
-        gtk_list_store_set (mdl, &iter, 0, p->title, -1);
+        const char *s = p->title;
+        if (type == PRESET_TYPE_ENCODER && ((ddb_encoder_preset_t *)p)->readonly) {
+            char stock[1000];
+            snprintf (stock, sizeof (stock), _("[Built-in] %s"), p->title);
+            s = stock;
+        }
+        gtk_list_store_set (mdl, &iter, 0, s, -1);
         p = p->next;
     }
 }
@@ -335,7 +348,7 @@ on_write_to_source_folder_toggled      (GtkToggleButton *togglebutton,
 
 static gboolean
 converter_show_cb (void *data) {
-    int ctx = (int)data;
+    int ctx = (intptr_t)data;
     converter_ctx_t *conv = malloc (sizeof (converter_ctx_t));
     current_ctx = conv;
     memset (conv, 0, sizeof (converter_ctx_t));
@@ -430,7 +443,7 @@ converter_show_cb (void *data) {
     // fill encoder presets
     combo = GTK_COMBO_BOX (lookup_widget (conv->converter, "encoder"));
     GtkListStore *mdl = GTK_LIST_STORE (gtk_combo_box_get_model (combo));
-    fill_presets (mdl, (ddb_preset_t *)converter_plugin->encoder_preset_get_list ());
+    fill_presets (mdl, (ddb_preset_t *)converter_plugin->encoder_preset_get_list (), PRESET_TYPE_ENCODER);
     gtk_combo_box_set_active (combo, deadbeef->conf_get_int ("converter.encoder_preset", 0));
 
     // fill dsp presets
@@ -439,7 +452,7 @@ converter_show_cb (void *data) {
     GtkTreeIter iter;
     gtk_list_store_append (mdl, &iter);
     gtk_list_store_set (mdl, &iter, 0, "Pass through", -1);
-    fill_presets (mdl, (ddb_preset_t *)converter_plugin->dsp_preset_get_list ());
+    fill_presets (mdl, (ddb_preset_t *)converter_plugin->dsp_preset_get_list (), PRESET_TYPE_DSP);
 
     gtk_combo_box_set_active (combo, deadbeef->conf_get_int ("converter.dsp_preset", -1) + 1);
 
@@ -474,11 +487,16 @@ converter_show_cb (void *data) {
         current_ctx = NULL;
         break;
     }
+    converter_active = 0;
     return FALSE;
 }
 
 static int
 converter_show (DB_plugin_action_t *act, int ctx) {
+    if (converter_active) {
+        return -1;
+    }
+    converter_active = 1;
     if (converter_plugin->misc.plugin.version_minor >= 1) {
         // reload all presets
         converter_plugin->free_encoder_presets ();
@@ -487,7 +505,7 @@ converter_show (DB_plugin_action_t *act, int ctx) {
         converter_plugin->load_dsp_presets ();
     }
     // this can be called from non-gtk thread
-    gdk_threads_add_idle (converter_show_cb, (void *)ctx);
+    gdk_threads_add_idle (converter_show_cb, (void *)(intptr_t)ctx);
     return 0;
 }
 
@@ -686,13 +704,12 @@ init_encoder_preset_from_dlg (GtkWidget *dlg, ddb_encoder_preset_t *p) {
 }
 
 int
-edit_encoder_preset (char *title, GtkWidget *toplevel, int overwrite) {
+edit_encoder_preset (char *title, GtkWidget *toplevel) {
     GtkWidget *dlg = create_convpreset_editor ();
     gtk_window_set_title (GTK_WINDOW (dlg), title);
     gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
 
     gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (toplevel));
-
     ddb_encoder_preset_t *p = current_ctx->current_encoder_preset;
 
     if (p->title) {
@@ -721,7 +738,19 @@ edit_encoder_preset (char *title, GtkWidget *toplevel, int overwrite) {
             ddb_encoder_preset_t *p = converter_plugin->encoder_preset_alloc ();
             if (p) {
                 init_encoder_preset_from_dlg (dlg, p);
-                int err = converter_plugin->encoder_preset_save (p, overwrite);
+                int err = 0;
+
+                ddb_encoder_preset_t *pp = converter_plugin->encoder_preset_get_list ();
+                for (; pp; pp = pp->next) {
+                    if (pp != old && !strcmp (pp->title, p->title)) {
+                        err = -2;
+                        break;
+                    }
+                }
+
+                if (!err) {
+                    err = converter_plugin->encoder_preset_save (p, 1);
+                }
                 if (!err) {
                     if (old->title && strcmp (p->title, old->title)) {
                         char path[1024];
@@ -771,7 +800,7 @@ refresh_encoder_lists (GtkComboBox *combo, GtkTreeView *list) {
     }
 
     gtk_list_store_clear (mdl);
-    fill_presets (mdl, (ddb_preset_t *)converter_plugin->encoder_preset_get_list ());
+    fill_presets (mdl, (ddb_preset_t *)converter_plugin->encoder_preset_get_list (), PRESET_TYPE_ENCODER);
     if (idx != -1) {
         path = gtk_tree_path_new_from_indices (idx, -1);
         gtk_tree_view_set_cursor (GTK_TREE_VIEW (list), path, col, FALSE);
@@ -782,7 +811,7 @@ refresh_encoder_lists (GtkComboBox *combo, GtkTreeView *list) {
     int act = gtk_combo_box_get_active (combo);
     mdl = GTK_LIST_STORE (gtk_combo_box_get_model (combo));
     gtk_list_store_clear (mdl);
-    fill_presets (mdl, (ddb_preset_t *)converter_plugin->encoder_preset_get_list ());
+    fill_presets (mdl, (ddb_preset_t *)converter_plugin->encoder_preset_get_list (), PRESET_TYPE_ENCODER);
     gtk_combo_box_set_active (combo, act);
 }
 
@@ -794,7 +823,7 @@ on_encoder_preset_add                     (GtkButton       *button,
 
     current_ctx->current_encoder_preset = converter_plugin->encoder_preset_alloc ();
 
-    if (GTK_RESPONSE_OK == edit_encoder_preset (_("Add new encoder"), toplevel, 0)) {
+    if (GTK_RESPONSE_OK == edit_encoder_preset (_("Add new encoder"), toplevel)) {
         converter_plugin->encoder_preset_append (current_ctx->current_encoder_preset);
         GtkComboBox *combo = GTK_COMBO_BOX (lookup_widget (current_ctx->converter, "encoder"));
         GtkWidget *list = lookup_widget (toplevel, "presets");
@@ -824,7 +853,7 @@ on_encoder_preset_edit                     (GtkButton       *button,
     ddb_encoder_preset_t *p = converter_plugin->encoder_preset_get_for_idx (idx);
     current_ctx->current_encoder_preset = p;
 
-    int r = edit_encoder_preset (_("Edit encoder"), toplevel, 1);
+    int r = edit_encoder_preset (_("Edit encoder"), toplevel);
     if (r == GTK_RESPONSE_OK) {
         GtkComboBox *combo = GTK_COMBO_BOX (lookup_widget (current_ctx->converter, "encoder"));
         refresh_encoder_lists (combo, GTK_TREE_VIEW (list));
@@ -877,6 +906,66 @@ on_encoder_preset_remove                     (GtkButton       *button,
     }
 }
 
+static void
+on_encoder_preset_cursor_changed (GtkTreeView     *treeview,
+                                        gpointer         user_data) {
+    GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (treeview));
+    GtkWidget *edit = lookup_widget (toplevel, "edit");
+    GtkWidget *remove = lookup_widget (toplevel, "remove");
+
+    GtkTreePath *path;
+    GtkTreeViewColumn *col;
+    gtk_tree_view_get_cursor (treeview, &path, &col);
+    if (!path || !col) {
+        // nothing selected
+        gtk_widget_set_sensitive (edit, FALSE);
+        gtk_widget_set_sensitive (remove, FALSE);
+        return;
+    }
+    int *indices = gtk_tree_path_get_indices (path);
+    int idx = *indices;
+    g_free (indices);
+
+    ddb_encoder_preset_t *p = converter_plugin->encoder_preset_get_for_idx (idx);
+    gtk_widget_set_sensitive (edit, !p->readonly);
+    gtk_widget_set_sensitive (remove, !p->readonly);
+}
+
+
+void
+on_encoder_preset_copy (GtkButton *button, gpointer user_data)
+{
+    GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
+
+    GtkTreeView *treeview = GTK_TREE_VIEW (lookup_widget (toplevel, "presets"));
+
+    GtkTreePath *path;
+    GtkTreeViewColumn *col;
+    gtk_tree_view_get_cursor (treeview, &path, &col);
+    if (!path || !col) {
+        return;
+    }
+    int *indices = gtk_tree_path_get_indices (path);
+    int idx = *indices;
+    g_free (indices);
+
+    ddb_encoder_preset_t *p = converter_plugin->encoder_preset_get_for_idx (idx);
+
+    current_ctx->current_encoder_preset = converter_plugin->encoder_preset_alloc ();
+    if (!current_ctx->current_encoder_preset) {
+        return;
+    }
+    converter_plugin->encoder_preset_copy (current_ctx->current_encoder_preset, p);
+
+    if (GTK_RESPONSE_OK == edit_encoder_preset (_("Add new encoder"), toplevel)) {
+        converter_plugin->encoder_preset_append (current_ctx->current_encoder_preset);
+        GtkComboBox *combo = GTK_COMBO_BOX (lookup_widget (current_ctx->converter, "encoder"));
+        refresh_encoder_lists (combo, treeview);
+    }
+
+    current_ctx->current_encoder_preset = NULL;
+}
+
 void
 on_edit_encoder_presets_clicked        (GtkButton       *button,
                                         gpointer         user_data)
@@ -887,14 +976,16 @@ on_edit_encoder_presets_clicked        (GtkButton       *button,
     g_signal_connect ((gpointer)lookup_widget (dlg, "add"), "clicked", G_CALLBACK (on_encoder_preset_add), NULL);
     g_signal_connect ((gpointer)lookup_widget (dlg, "remove"), "clicked", G_CALLBACK (on_encoder_preset_remove), NULL);
     g_signal_connect ((gpointer)lookup_widget (dlg, "edit"), "clicked", G_CALLBACK (on_encoder_preset_edit), NULL);
+    g_signal_connect ((gpointer)lookup_widget (dlg, "copy"), "clicked", G_CALLBACK (on_encoder_preset_copy), NULL);
 
     GtkWidget *list = lookup_widget (dlg, "presets");
+    g_signal_connect ((gpointer)list, "cursor-changed", G_CALLBACK (on_encoder_preset_cursor_changed), NULL);
     GtkCellRenderer *title_cell = gtk_cell_renderer_text_new ();
     GtkTreeViewColumn *col = gtk_tree_view_column_new_with_attributes (_("Title"), title_cell, "text", 0, NULL);
     gtk_tree_view_append_column (GTK_TREE_VIEW (list), GTK_TREE_VIEW_COLUMN (col));
     GtkListStore *mdl = gtk_list_store_new (1, G_TYPE_STRING);
     gtk_tree_view_set_model (GTK_TREE_VIEW (list), GTK_TREE_MODEL (mdl));
-    fill_presets (mdl, (ddb_preset_t *)converter_plugin->encoder_preset_get_list ());
+    fill_presets (mdl, (ddb_preset_t *)converter_plugin->encoder_preset_get_list (), PRESET_TYPE_ENCODER);
     int curr = deadbeef->conf_get_int ("converter.encoder_preset", -1);
     if (curr != -1) {
         GtkTreePath *path = gtk_tree_path_new_from_indices (curr, -1);
@@ -903,6 +994,7 @@ on_edit_encoder_presets_clicked        (GtkButton       *button,
             gtk_tree_path_free (path);
         }
     }
+    on_encoder_preset_cursor_changed (GTK_TREE_VIEW (list), NULL);
     gtk_dialog_run (GTK_DIALOG (dlg));
     gtk_widget_destroy (dlg);
 }
@@ -1174,7 +1266,7 @@ on_dsp_preset_plugin_down_clicked      (GtkButton       *button,
 
 
 int
-edit_dsp_preset (const char *title, GtkWidget *toplevel, int overwrite) {
+edit_dsp_preset (const char *title, GtkWidget *toplevel, ddb_dsp_preset_t *orig) {
     int r = GTK_RESPONSE_CANCEL;
 
     GtkWidget *dlg = create_dsppreset_editor ();
@@ -1182,10 +1274,11 @@ edit_dsp_preset (const char *title, GtkWidget *toplevel, int overwrite) {
     gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (toplevel));
     gtk_window_set_title (GTK_WINDOW (dlg), title);
 
+    ddb_dsp_preset_t *p = current_ctx->current_dsp_preset;
 
     // title
-    if (current_ctx->current_dsp_preset->title) {
-        gtk_entry_set_text (GTK_ENTRY (lookup_widget (dlg, "title")), current_ctx->current_dsp_preset->title);
+    if (p->title) {
+        gtk_entry_set_text (GTK_ENTRY (lookup_widget (dlg, "title")), p->title);
     }
 
     {
@@ -1206,11 +1299,26 @@ edit_dsp_preset (const char *title, GtkWidget *toplevel, int overwrite) {
         r = gtk_dialog_run (GTK_DIALOG (dlg));
 
         if (r == GTK_RESPONSE_OK) {
-            if (current_ctx->current_dsp_preset->title) {
-                free (current_ctx->current_dsp_preset->title);
+            const char *title = gtk_entry_get_text (GTK_ENTRY (lookup_widget (dlg, "title")));
+            int err = 0;
+
+            // don't allow duplicate title with existing presets
+            ddb_dsp_preset_t *pp = converter_plugin->dsp_preset_get_list ();
+            for (; pp; pp = pp->next) {
+                if (pp != orig && !strcmp (pp->title, title)) {
+                    err = -2;
+                    break;
+                }
+            }
+
+            if (!err) {
+                if (current_ctx->current_dsp_preset->title) {
+                    free (current_ctx->current_dsp_preset->title);
+                }
+                current_ctx->current_dsp_preset->title = strdup (title);
+                err = converter_plugin->dsp_preset_save (current_ctx->current_dsp_preset, 1);
             }
-            current_ctx->current_dsp_preset->title = strdup (gtk_entry_get_text (GTK_ENTRY (lookup_widget (dlg, "title"))));
-            int err = converter_plugin->dsp_preset_save (current_ctx->current_dsp_preset, overwrite);
+
             if (err < 0) {
                 GtkWidget *warndlg = gtk_message_dialog_new (GTK_WINDOW (gtkui_plugin->get_mainwin ()), GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Failed to save DSP preset"));
                 gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (warndlg), err == -1 ? _("Check preset folder permissions, try to pick different title, or free up some disk space") : _("Preset with the same name already exists. Try to pick another title."));
@@ -1248,7 +1356,7 @@ refresh_dsp_lists (GtkComboBox *combo, GtkTreeView *list) {
     }
 
     gtk_list_store_clear (mdl);
-    fill_presets (mdl, (ddb_preset_t *)converter_plugin->dsp_preset_get_list ());
+    fill_presets (mdl, (ddb_preset_t *)converter_plugin->dsp_preset_get_list (), PRESET_TYPE_DSP);
     if (idx != -1) {
         path = gtk_tree_path_new_from_indices (idx, -1);
         gtk_tree_view_set_cursor (GTK_TREE_VIEW (list), path, col, FALSE);
@@ -1262,7 +1370,7 @@ refresh_dsp_lists (GtkComboBox *combo, GtkTreeView *list) {
     GtkTreeIter iter;
     gtk_list_store_append (mdl, &iter);
     gtk_list_store_set (mdl, &iter, 0, "Pass through", -1);
-    fill_presets (mdl, (ddb_preset_t *)converter_plugin->dsp_preset_get_list ());
+    fill_presets (mdl, (ddb_preset_t *)converter_plugin->dsp_preset_get_list (), PRESET_TYPE_DSP);
     gtk_combo_box_set_active (combo, act);
 }
 
@@ -1276,7 +1384,7 @@ on_dsp_preset_add                     (GtkButton       *button,
     
     GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
 
-    if (GTK_RESPONSE_OK == edit_dsp_preset (_("New DSP Preset"), toplevel, 0)) {
+    if (GTK_RESPONSE_OK == edit_dsp_preset (_("New DSP Preset"), toplevel, NULL)) {
         converter_plugin->dsp_preset_append (current_ctx->current_dsp_preset);
         GtkComboBox *combo = GTK_COMBO_BOX (lookup_widget (current_ctx->converter, "dsp_preset"));
         GtkWidget *list = lookup_widget (toplevel, "presets");
@@ -1290,6 +1398,43 @@ on_dsp_preset_add                     (GtkButton       *button,
 }
 
 void
+on_dsp_preset_copy (GtkButton *button, gpointer user_data)
+{
+    GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
+
+    GtkTreeView *treeview = GTK_TREE_VIEW (lookup_widget (toplevel, "presets"));
+
+    GtkTreePath *path;
+    GtkTreeViewColumn *col;
+    gtk_tree_view_get_cursor (treeview, &path, &col);
+    if (!path || !col) {
+        return;
+    }
+    int *indices = gtk_tree_path_get_indices (path);
+    int idx = *indices;
+    g_free (indices);
+
+    ddb_dsp_preset_t *p = converter_plugin->dsp_preset_get_for_idx (idx);
+
+    current_ctx->current_dsp_preset = converter_plugin->dsp_preset_alloc ();
+    if (!current_ctx->current_dsp_preset) {
+        return;
+    }
+    converter_plugin->dsp_preset_copy (current_ctx->current_dsp_preset, p);
+
+    if (GTK_RESPONSE_OK == edit_dsp_preset (_("New DSP Preset"), toplevel, NULL)) {
+        converter_plugin->dsp_preset_append (current_ctx->current_dsp_preset);
+        GtkComboBox *combo = GTK_COMBO_BOX (lookup_widget (current_ctx->converter, "dsp_preset"));
+        refresh_dsp_lists (combo, treeview);
+    }
+    else {
+        converter_plugin->dsp_preset_free (current_ctx->current_dsp_preset);
+    }
+
+    current_ctx->current_dsp_preset = NULL;
+}
+
+void
 on_dsp_preset_remove                     (GtkButton       *button,
                                         gpointer         user_data)
 {
@@ -1361,7 +1506,7 @@ on_dsp_preset_edit                     (GtkButton       *button,
     current_ctx->current_dsp_preset = converter_plugin->dsp_preset_alloc ();
     converter_plugin->dsp_preset_copy (current_ctx->current_dsp_preset, p);
 
-    int r = edit_dsp_preset (_("Edit DSP Preset"), toplevel, 1);
+    int r = edit_dsp_preset (_("Edit DSP Preset"), toplevel, p);
     if (r == GTK_RESPONSE_OK) {
         // replace preset
         converter_plugin->dsp_preset_replace (p, current_ctx->current_dsp_preset);
@@ -1386,6 +1531,7 @@ on_edit_dsp_presets_clicked            (GtkButton       *button,
     g_signal_connect ((gpointer)lookup_widget (dlg, "add"), "clicked", G_CALLBACK (on_dsp_preset_add), NULL);
     g_signal_connect ((gpointer)lookup_widget (dlg, "remove"), "clicked", G_CALLBACK (on_dsp_preset_remove), NULL);
     g_signal_connect ((gpointer)lookup_widget (dlg, "edit"), "clicked", G_CALLBACK (on_dsp_preset_edit), NULL);
+    g_signal_connect ((gpointer)lookup_widget (dlg, "copy"), "clicked", G_CALLBACK (on_dsp_preset_copy), NULL);
 
     GtkWidget *list = lookup_widget (dlg, "presets");
     GtkCellRenderer *title_cell = gtk_cell_renderer_text_new ();
@@ -1393,7 +1539,7 @@ on_edit_dsp_presets_clicked            (GtkButton       *button,
     gtk_tree_view_append_column (GTK_TREE_VIEW (list), GTK_TREE_VIEW_COLUMN (col));
     GtkListStore *mdl = gtk_list_store_new (1, G_TYPE_STRING);
     gtk_tree_view_set_model (GTK_TREE_VIEW (list), GTK_TREE_MODEL (mdl));
-    fill_presets (mdl, (ddb_preset_t *)converter_plugin->dsp_preset_get_list ());
+    fill_presets (mdl, (ddb_preset_t *)converter_plugin->dsp_preset_get_list (), PRESET_TYPE_DSP);
     int curr = deadbeef->conf_get_int ("converter.dsp_preset", -1);
     if (curr >= 0) {
         GtkTreePath *path = gtk_tree_path_new_from_indices (curr, -1);
@@ -1418,7 +1564,7 @@ GtkWidget*
 title_formatting_help_link_create (gchar *widget_name, gchar *string1, gchar *string2,
                 gint int1, gint int2)
 {
-    GtkWidget *link = gtk_link_button_new_with_label ("http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting", _("Help"));
+    GtkWidget *link = gtk_link_button_new_with_label ("http://github.com/Alexey-Yakovenko/deadbeef/wiki/Title-formatting", _("Help"));
     return link;
 }
 
@@ -1426,7 +1572,7 @@ GtkWidget*
 encoder_cmdline_help_link_create (gchar *widget_name, gchar *string1, gchar *string2,
                 gint int1, gint int2)
 {
-    GtkWidget *link = gtk_link_button_new_with_label ("http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Encoder_Command_Line", _("Help"));
+    GtkWidget *link = gtk_link_button_new_with_label ("http://github.com/Alexey-Yakovenko/deadbeef/wiki/Encoder-Command-Line", _("Help"));
     return link;
 }
 
@@ -1456,8 +1602,8 @@ convgui_connect (void) {
         fprintf (stderr, "convgui: converter plugin not found\n");
         return -1;
     }
-    if (!PLUG_TEST_COMPAT(&converter_plugin->misc.plugin, 1, 2)) {
-        fprintf (stderr, "convgui: need converter>=1.2, but found %d.%d\n", converter_plugin->misc.plugin.version_major, converter_plugin->misc.plugin.version_minor);
+    if (!PLUG_TEST_COMPAT(&converter_plugin->misc.plugin, 1, 3)) {
+        fprintf (stderr, "convgui: need converter>=1.3, but found %d.%d\n", converter_plugin->misc.plugin.version_major, converter_plugin->misc.plugin.version_minor);
         return -1;
     }
     return 0;
diff --git a/plugins/converter/interface.c b/plugins/converter/interface.c
index dc17c11..56b5bdc 100644
--- a/plugins/converter/interface.c
+++ b/plugins/converter/interface.c
@@ -72,6 +72,7 @@ create_converterdlg (void)
 
   converterdlg = gtk_dialog_new ();
   gtk_window_set_title (GTK_WINDOW (converterdlg), "Converter");
+  gtk_window_set_position (GTK_WINDOW (converterdlg), GTK_WIN_POS_MOUSE);
   gtk_window_set_modal (GTK_WINDOW (converterdlg), TRUE);
   gtk_window_set_destroy_with_parent (GTK_WINDOW (converterdlg), TRUE);
   gtk_window_set_type_hint (GTK_WINDOW (converterdlg), GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -791,6 +792,7 @@ create_preset_list (void)
   GtkWidget *vbox33;
   GtkWidget *hbox94;
   GtkWidget *add;
+  GtkWidget *copy;
   GtkWidget *remove;
   GtkWidget *edit;
   GtkWidget *scrolledwindow8;
@@ -820,6 +822,10 @@ create_preset_list (void)
   gtk_widget_show (add);
   gtk_box_pack_start (GTK_BOX (hbox94), add, FALSE, TRUE, 0);
 
+  copy = gtk_button_new_from_stock ("gtk-copy");
+  gtk_widget_show (copy);
+  gtk_box_pack_start (GTK_BOX (hbox94), copy, FALSE, TRUE, 0);
+
   remove = gtk_button_new_from_stock ("gtk-remove");
   gtk_widget_show (remove);
   gtk_box_pack_start (GTK_BOX (hbox94), remove, FALSE, TRUE, 0);
@@ -855,6 +861,7 @@ create_preset_list (void)
   GLADE_HOOKUP_OBJECT (preset_list, vbox33, "vbox33");
   GLADE_HOOKUP_OBJECT (preset_list, hbox94, "hbox94");
   GLADE_HOOKUP_OBJECT (preset_list, add, "add");
+  GLADE_HOOKUP_OBJECT (preset_list, copy, "copy");
   GLADE_HOOKUP_OBJECT (preset_list, remove, "remove");
   GLADE_HOOKUP_OBJECT (preset_list, edit, "edit");
   GLADE_HOOKUP_OBJECT (preset_list, scrolledwindow8, "scrolledwindow8");
diff --git a/plugins/converter/presets/AAC_(Nero_FAAC).txt b/plugins/converter/presets/ALAC.txt
similarity index 54%
copy from plugins/converter/presets/AAC_(Nero_FAAC).txt
copy to plugins/converter/presets/ALAC.txt
index 1cefd45..3ede71f 100644
--- a/plugins/converter/presets/AAC_(Nero_FAAC).txt
+++ b/plugins/converter/presets/ALAC.txt
@@ -1,7 +1,7 @@
-title AAC (Nero FAAC)
-ext mp4
-encoder faac -w -o %o -
-method 0
+title ALAC
+ext m4a
+encoder ffmpeg -i %i -acodec alac %o
+method 1
 id3v2_version 0
 tag_id3v2 0
 tag_id3v1 0
diff --git a/plugins/converter/presets/Ogg_FLAC.txt b/plugins/converter/presets/Ogg_FLAC.txt
new file mode 100644
index 0000000..5fe7676
--- /dev/null
+++ b/plugins/converter/presets/Ogg_FLAC.txt
@@ -0,0 +1,10 @@
+title Ogg FLAC
+ext oga
+encoder flac --ignore-chunk-sizes --no-padding --ogg -o %o -8 -
+method 0
+id3v2_version 0
+tag_id3v2 0
+tag_id3v1 0
+tag_apev2 0
+tag_flac 1
+tag_oggvorbis 0
diff --git a/plugins/converter/presets/Ogg_Vorbis_(-q_5).txt b/plugins/converter/presets/Opus.txt
similarity index 59%
copy from plugins/converter/presets/Ogg_Vorbis_(-q_5).txt
copy to plugins/converter/presets/Opus.txt
index 081b21f..70a259f 100644
--- a/plugins/converter/presets/Ogg_Vorbis_(-q_5).txt
+++ b/plugins/converter/presets/Opus.txt
@@ -1,6 +1,6 @@
-title Ogg Vorbis (-q 5)
-ext ogg
-encoder oggenc -q 5 -o %o -
+title Opus
+ext opus
+encoder opusenc --bitrate 128 - %o
 method 0
 id3v2_version 0
 tag_id3v2 0
diff --git a/plugins/coreaudio/COPYING b/plugins/coreaudio/COPYING
new file mode 100644
index 0000000..fb7c6b6
--- /dev/null
+++ b/plugins/coreaudio/COPYING
@@ -0,0 +1,17 @@
+CoreAudio Output Deadbeef Plugin
+Copyright (c) 2011-2013 Carlos Nunes <carloslnunes at gmail.com>
+
+This plugin 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 of the License, or (at your option) any later version.
+
+This plugin 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
+
diff --git a/plugins/coreaudio/Makefile.am b/plugins/coreaudio/Makefile.am
index bd0c66c..1e33b85 100644
--- a/plugins/coreaudio/Makefile.am
+++ b/plugins/coreaudio/Makefile.am
@@ -1,7 +1,7 @@
 if HAVE_COREAUDIO
 pkglib_LTLIBRARIES = coreaudio.la
 coreaudio_la_SOURCES = coreaudio.c
-coreaudio_la_LDFLAGS = -module
+coreaudio_la_LDFLAGS = -module -avoid-version
 coreaudio_la_LIBADD = $(LDADD) $(COREAUDIO_LIBS)
 
 AM_CFLAGS = $(CFLAGS) -std=c99 $(COREAUDIO_CFLAGS)
diff --git a/plugins/coreaudio/Makefile.in b/plugins/coreaudio/Makefile.in
index 296cbc9..b42fb61 100644
--- a/plugins/coreaudio/Makefile.in
+++ b/plugins/coreaudio/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/coreaudio
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -115,23 +143,48 @@ am__DEPENDENCIES_1 =
 am__coreaudio_la_SOURCES_DIST = coreaudio.c
 @HAVE_COREAUDIO_TRUE at am_coreaudio_la_OBJECTS = coreaudio.lo
 coreaudio_la_OBJECTS = $(am_coreaudio_la_OBJECTS)
-coreaudio_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+coreaudio_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(coreaudio_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_COREAUDIO_TRUE at am_coreaudio_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(coreaudio_la_SOURCES)
 DIST_SOURCES = $(am__coreaudio_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -139,6 +192,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -165,6 +235,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -185,10 +256,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -211,6 +284,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -264,6 +338,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -282,6 +357,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -307,13 +384,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -322,7 +403,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -382,7 +465,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @HAVE_COREAUDIO_TRUE at pkglib_LTLIBRARIES = coreaudio.la
 @HAVE_COREAUDIO_TRUE at coreaudio_la_SOURCES = coreaudio.c
- at HAVE_COREAUDIO_TRUE@coreaudio_la_LDFLAGS = -module
+ at HAVE_COREAUDIO_TRUE@coreaudio_la_LDFLAGS = -module -avoid-version
 @HAVE_COREAUDIO_TRUE at coreaudio_la_LIBADD = $(LDADD) $(COREAUDIO_LIBS)
 @HAVE_COREAUDIO_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 $(COREAUDIO_CFLAGS)
 all: all-am
@@ -419,6 +502,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -445,14 +529,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 coreaudio.la: $(coreaudio_la_OBJECTS) $(coreaudio_la_DEPENDENCIES) $(EXTRA_coreaudio_la_DEPENDENCIES) 
-	$(coreaudio_la_LINK) $(am_coreaudio_la_rpath) $(coreaudio_la_OBJECTS) $(coreaudio_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(coreaudio_la_LINK) $(am_coreaudio_la_rpath) $(coreaudio_la_OBJECTS) $(coreaudio_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -463,25 +550,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/coreaudio.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,26 +576,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +596,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +609,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -681,19 +768,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/dca/COPYING b/plugins/dca/COPYING
index d511905..77d7529 100644
--- a/plugins/dca/COPYING
+++ b/plugins/dca/COPYING
@@ -1,339 +1,20 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 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.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, 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 or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-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 give any other recipients of the Program a copy of this License
-along with the Program.
-
-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 Program or any portion
-of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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 Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) 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; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, 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 executable.  However, as a
-special exception, the source code 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.
-
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
-
-  5. 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 Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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 to
-this License.
-
-  7. 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 Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
-
-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.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 Program
-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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  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 program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+DCA Plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
+
+libdca (C) Gildas Bazin et al.
+deadbeef-related modifications (C) Alexey Yakovenko
+see AUTHORS 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.
+
+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.
diff --git a/plugins/dca/Makefile.am b/plugins/dca/Makefile.am
index 9819c5a..a887fb9 100644
--- a/plugins/dca/Makefile.am
+++ b/plugins/dca/Makefile.am
@@ -22,7 +22,7 @@ tables_quantization.h\
 tables_vq.h\
 bitstream.h
 
-dca_la_LDFLAGS = -module
+dca_la_LDFLAGS = -module -avoid-version
 dca_la_LIBADD = $(LDADD) -lm
 
 AM_CFLAGS = $(CFLAGS) -fPIC -std=c99
diff --git a/plugins/dca/Makefile.in b/plugins/dca/Makefile.in
index 867c790..5b50ac4 100644
--- a/plugins/dca/Makefile.in
+++ b/plugins/dca/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,8 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/dca
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	AUTHORS COPYING
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp AUTHORS COPYING README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -120,23 +147,48 @@ am__dca_la_SOURCES_DIST = dcaplug.c extract_dca.c gettimeofday.c \
 @HAVE_DCA_TRUE@	gettimeofday.lo parse.lo bitstream.lo \
 @HAVE_DCA_TRUE@	downmix.lo
 dca_la_OBJECTS = $(am_dca_la_OBJECTS)
-dca_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(dca_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+dca_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(dca_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_DCA_TRUE at am_dca_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(dca_la_SOURCES)
 DIST_SOURCES = $(am__dca_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -144,6 +196,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -170,6 +239,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -190,10 +260,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -216,6 +288,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -269,6 +342,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -287,6 +361,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -312,13 +388,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -327,7 +407,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -406,7 +488,7 @@ top_srcdir = @top_srcdir@
 @HAVE_DCA_TRUE at tables_vq.h\
 @HAVE_DCA_TRUE at bitstream.h
 
- at HAVE_DCA_TRUE@dca_la_LDFLAGS = -module
+ at HAVE_DCA_TRUE@dca_la_LDFLAGS = -module -avoid-version
 @HAVE_DCA_TRUE at dca_la_LIBADD = $(LDADD) -lm
 @HAVE_DCA_TRUE at AM_CFLAGS = $(CFLAGS) -fPIC -std=c99
 all: all-am
@@ -443,6 +525,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -469,14 +552,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 dca.la: $(dca_la_OBJECTS) $(dca_la_DEPENDENCIES) $(EXTRA_dca_la_DEPENDENCIES) 
-	$(dca_la_LINK) $(am_dca_la_rpath) $(dca_la_OBJECTS) $(dca_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(dca_la_LINK) $(am_dca_la_rpath) $(dca_la_OBJECTS) $(dca_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -492,25 +578,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/parse.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -518,26 +604,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -549,15 +624,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -566,6 +637,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -710,19 +796,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/dca/dcaplug.c b/plugins/dca/dcaplug.c
index 6e21aa9..d2ea04d 100644
--- a/plugins/dca/dcaplug.c
+++ b/plugins/dca/dcaplug.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/dsp_libsrc/COPYING b/plugins/dsp_libsrc/COPYING
new file mode 100644
index 0000000..641f944
--- /dev/null
+++ b/plugins/dsp_libsrc/COPYING
@@ -0,0 +1,20 @@
+resampling plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
+
+libsamplerate
+Copyright (C) 2002-2008 Erik de Castro Lopo <erikd at mega-nerd.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.
+
diff --git a/plugins/dsp_libsrc/Makefile.am b/plugins/dsp_libsrc/Makefile.am
index 42c6a34..44527d4 100644
--- a/plugins/dsp_libsrc/Makefile.am
+++ b/plugins/dsp_libsrc/Makefile.am
@@ -3,7 +3,7 @@ pkglib_LTLIBRARIES = dsp_libsrc.la
 
 dsp_libsrc_la_SOURCES = src.c src.h
 
-dsp_libsrc_la_LDFLAGS = -module
+dsp_libsrc_la_LDFLAGS = -module -avoid-version
 
 dsp_libsrc_la_LIBADD = $(LIBADD) $(LIBSAMPLERATE_DEPS_LIBS)
 
diff --git a/plugins/dsp_libsrc/Makefile.in b/plugins/dsp_libsrc/Makefile.in
index 23ddfaa..c6fa679 100644
--- a/plugins/dsp_libsrc/Makefile.in
+++ b/plugins/dsp_libsrc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/dsp_libsrc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -114,23 +142,48 @@ am__DEPENDENCIES_1 =
 am__dsp_libsrc_la_SOURCES_DIST = src.c src.h
 @HAVE_DSP_SRC_TRUE at am_dsp_libsrc_la_OBJECTS = dsp_libsrc_la-src.lo
 dsp_libsrc_la_OBJECTS = $(am_dsp_libsrc_la_OBJECTS)
-dsp_libsrc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+dsp_libsrc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(dsp_libsrc_la_CFLAGS) \
 	$(CFLAGS) $(dsp_libsrc_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_DSP_SRC_TRUE at am_dsp_libsrc_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(dsp_libsrc_la_SOURCES)
 DIST_SOURCES = $(am__dsp_libsrc_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,6 +191,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,6 +234,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -184,10 +255,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -210,6 +283,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -263,6 +337,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -281,6 +356,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -306,13 +383,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -321,7 +402,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -381,7 +464,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @HAVE_DSP_SRC_TRUE at pkglib_LTLIBRARIES = dsp_libsrc.la
 @HAVE_DSP_SRC_TRUE at dsp_libsrc_la_SOURCES = src.c src.h
- at HAVE_DSP_SRC_TRUE@dsp_libsrc_la_LDFLAGS = -module
+ at HAVE_DSP_SRC_TRUE@dsp_libsrc_la_LDFLAGS = -module -avoid-version
 @HAVE_DSP_SRC_TRUE at dsp_libsrc_la_LIBADD = $(LIBADD) $(LIBSAMPLERATE_DEPS_LIBS)
 @HAVE_DSP_SRC_TRUE at dsp_libsrc_la_CFLAGS = $(CFLAGS) $(LIBSAMPLERATE_DEPS_CFLAGS) -std=c99
 all: all-am
@@ -418,6 +501,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -444,14 +528,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 dsp_libsrc.la: $(dsp_libsrc_la_OBJECTS) $(dsp_libsrc_la_DEPENDENCIES) $(EXTRA_dsp_libsrc_la_DEPENDENCIES) 
-	$(dsp_libsrc_la_LINK) $(am_dsp_libsrc_la_rpath) $(dsp_libsrc_la_OBJECTS) $(dsp_libsrc_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(dsp_libsrc_la_LINK) $(am_dsp_libsrc_la_rpath) $(dsp_libsrc_la_OBJECTS) $(dsp_libsrc_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -462,32 +549,32 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dsp_libsrc_la-src.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 dsp_libsrc_la-src.lo: src.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dsp_libsrc_la_CFLAGS) $(CFLAGS) -MT dsp_libsrc_la-src.lo -MD -MP -MF $(DEPDIR)/dsp_libsrc_la-src.Tpo -c -o dsp_libsrc_la-src.lo `test -f 'src.c' || echo '$(srcdir)/'`src.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dsp_libsrc_la-src.Tpo $(DEPDIR)/dsp_libsrc_la-src.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src.c' object='dsp_libsrc_la-src.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dsp_libsrc_la_CFLAGS) $(CFLAGS) -MT dsp_libsrc_la-src.lo -MD -MP -MF $(DEPDIR)/dsp_libsrc_la-src.Tpo -c -o dsp_libsrc_la-src.lo `test -f 'src.c' || echo '$(srcdir)/'`src.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dsp_libsrc_la-src.Tpo $(DEPDIR)/dsp_libsrc_la-src.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src.c' object='dsp_libsrc_la-src.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dsp_libsrc_la_CFLAGS) $(CFLAGS) -c -o dsp_libsrc_la-src.lo `test -f 'src.c' || echo '$(srcdir)/'`src.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dsp_libsrc_la_CFLAGS) $(CFLAGS) -c -o dsp_libsrc_la-src.lo `test -f 'src.c' || echo '$(srcdir)/'`src.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -495,26 +582,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -526,15 +602,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -543,6 +615,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -687,19 +774,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/dsp_libsrc/src.c b/plugins/dsp_libsrc/src.c
index 786bbcd..7c0e8c0 100644
--- a/plugins/dsp_libsrc/src.c
+++ b/plugins/dsp_libsrc/src.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/dsp_libsrc/src.h b/plugins/dsp_libsrc/src.h
index 4359af5..f894a6a 100644
--- a/plugins/dsp_libsrc/src.h
+++ b/plugins/dsp_libsrc/src.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/dumb/dumb-kode54/licence.txt b/plugins/dumb/COPYING
similarity index 72%
copy from plugins/dumb/dumb-kode54/licence.txt
copy to plugins/dumb/COPYING
index 70de919..3621cca 100644
--- a/plugins/dumb/dumb-kode54/licence.txt
+++ b/plugins/dumb/COPYING
@@ -1,77 +1,89 @@
-/*  _______         ____    __         ___    ___
- * \    _  \       \    /  \  /       \   \  /   /       '   '  '
- *  |  | \  \       |  |    ||         |   \/   |         .      .
- *  |  |  |  |      |  |    ||         ||\  /|  |
- *  |  |  |  |      |  |    ||         || \/ |  |         '  '  '
- *  |  |  |  |      |  |    ||         ||    |  |         .      .
- *  |  |_/  /        \  \__//          ||    |  |
- * /_______/ynamic    \____/niversal  /__\  /____\usic   /|  .  . ibliotheque
- *                                                      /  \
- *                                                     / .  \
- * licence.txt - Conditions for use of DUMB.          / / \  \
- *                                                   | <  /   \_
- * If you do not agree to these terms, please        |  \/ /\   /
- * do not use DUMB.                                   \_  /  > /
- *                                                      | \ / /
- * Information in [brackets] is provided to aid         |  ' /
- * interpretation of the licence.                        \__/
- */
-
-
-Dynamic Universal Music Bibliotheque, Version 0.9.3
-
-Copyright (C) 2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event shall the authors be held liable for any damages arising from the
-use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim
-   that you wrote the original software. If you use this software in a
-   product, you are requested to acknowledge its use in the product
-   documentation, along with details on where to get an unmodified version of
-   this software, but this is not a strict requirement.
-
-   [Note that the above point asks for a link to DUMB, not just a mention.
-   Googling for DUMB doesn't help much! The URL is "http://dumb.sf.net/".]
-
-   [The link was originally strictly required. This was changed for two
-   reasons. Firstly, if many projects request an acknowledgement, the list of
-   acknowledgements can become quite unmanageable. Secondly, DUMB was placing
-   a restriction on the code using it, preventing people from using the GNU
-   General Public Licence which disallows any such restrictions. See
-   http://www.gnu.org/philosophy/bsd.html for more information on this
-   subject. However, if DUMB plays a significant part in your project, we do
-   urge you to acknowledge its use.]
-
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-
-3. This notice may not be removed from or altered in any source distribution.
-
-4. If you are using the Program in someone else's bedroom on any Monday at
-   3:05 pm, you are not allowed to modify the Program for ten minutes. [This
-   clause provided by Inphernic; every licence should contain at least one
-   clause, the reasoning behind which is far from obvious.]
-
-5. Users who wish to use DUMB for the specific purpose of playing music are
-   required to feed their dog on every full moon (if deemed appropriate).
-   [This clause provided by Allefant, who couldn't remember what Inphernic's
-   clause was.]
-
-6. No clause in this licence shall prevent this software from being depended
-   upon by a product licensed under the GNU General Public Licence. If such a
-   clause is deemed to exist, Debian, then it shall be respected in spirit as
-   far as possible and all other clauses shall continue to apply in full
-   force.
-
-We regret that we cannot provide any warranty, not even the implied warranty
-of merchantability or fitness for a particular purpose.
-
-Some files generated or copied by automake, autoconf and friends are
-available in an extra download. These fall under separate licences but are
-all free to distribute. Please check their licences as necessary.
+DUMB plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+modified DUMB 0.9.3
+Dynamic Universal Music Bibliotheque, Version 0.9.3
+
+Copyright (C) 2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event shall the authors be held liable for any damages arising from the
+use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim
+   that you wrote the original software. If you use this software in a
+   product, you are requested to acknowledge its use in the product
+   documentation, along with details on where to get an unmodified version of
+   this software, but this is not a strict requirement.
+
+   [Note that the above point asks for a link to DUMB, not just a mention.
+   Googling for DUMB doesn't help much! The URL is "http://dumb.sf.net/".]
+
+   [The link was originally strictly required. This was changed for two
+   reasons. Firstly, if many projects request an acknowledgement, the list of
+   acknowledgements can become quite unmanageable. Secondly, DUMB was placing
+   a restriction on the code using it, preventing people from using the GNU
+   General Public Licence which disallows any such restrictions. See
+   http://www.gnu.org/philosophy/bsd.html for more information on this
+   subject. However, if DUMB plays a significant part in your project, we do
+   urge you to acknowledge its use.]
+
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+
+3. This notice may not be removed from or altered in any source distribution.
+
+4. If you are using the Program in someone else's bedroom on any Monday at
+   3:05 pm, you are not allowed to modify the Program for ten minutes. [This
+   clause provided by Inphernic; every licence should contain at least one
+   clause, the reasoning behind which is far from obvious.]
+
+5. Users who wish to use DUMB for the specific purpose of playing music are
+   required to feed their dog on every full moon (if deemed appropriate).
+   [This clause provided by Allefant, who couldn't remember what Inphernic's
+   clause was.]
+
+6. No clause in this licence shall prevent this software from being depended
+   upon by a product licensed under the GNU General Public Licence. If such a
+   clause is deemed to exist, Debian, then it shall be respected in spirit as
+   far as possible and all other clauses shall continue to apply in full
+   force.
+
+We regret that we cannot provide any warranty, not even the implied warranty
+of merchantability or fitness for a particular purpose.
+
+Some files generated or copied by automake, autoconf and friends are
+available in an extra download. These fall under separate licences but are
+all free to distribute. Please check their licences as necessary.
+
+
+
+Uses code from kode54's foobar2000 plugin, http://kode54.foobar2000.org/
+
+
+
+deadbeef-related modifications (C) Alexey Yakovenko
diff --git a/plugins/dumb/Makefile.am b/plugins/dumb/Makefile.am
index 38e6d83..74e2357 100644
--- a/plugins/dumb/Makefile.am
+++ b/plugins/dumb/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = $(dumbpath)/readme.txt $(dumbpath)/ChangeLog $(dumbpath)/licence.tx
 pkglib_LTLIBRARIES = ddb_dumb.la
 
 AM_CFLAGS = $(CFLAGS) -I$(dumbpath)/include -std=c99
-ddb_dumb_la_LDFLAGS = -module -lm
+ddb_dumb_la_LDFLAGS = -module -avoid-version -lm
 
 ddb_dumb_la_SOURCES =\
 dumb-kode54/src/it/readam.c\
diff --git a/plugins/dumb/Makefile.in b/plugins/dumb/Makefile.in
index d795780..758d93d 100644
--- a/plugins/dumb/Makefile.in
+++ b/plugins/dumb/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/dumb
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -190,23 +218,48 @@ am__ddb_dumb_la_SOURCES_DIST = dumb-kode54/src/it/readam.c \
 @HAVE_DUMB_TRUE@	silence.lo stdfile.lo resample.lo riff.lo \
 @HAVE_DUMB_TRUE@	memfile.lo sampbuf.lo barray.lo cdumb.lo
 ddb_dumb_la_OBJECTS = $(am_ddb_dumb_la_OBJECTS)
-ddb_dumb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+ddb_dumb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(ddb_dumb_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_DUMB_TRUE at am_ddb_dumb_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(ddb_dumb_la_SOURCES)
 DIST_SOURCES = $(am__ddb_dumb_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -214,6 +267,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -240,6 +310,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -260,10 +331,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -286,6 +359,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -339,6 +413,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -357,6 +432,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -382,13 +459,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -397,7 +478,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -459,7 +542,7 @@ top_srcdir = @top_srcdir@
 @HAVE_DUMB_TRUE at EXTRA_DIST = $(dumbpath)/readme.txt $(dumbpath)/ChangeLog $(dumbpath)/licence.txt $(dumbpath)/release.txt $(dumbpath)/todo.txt
 @HAVE_DUMB_TRUE at pkglib_LTLIBRARIES = ddb_dumb.la
 @HAVE_DUMB_TRUE at AM_CFLAGS = $(CFLAGS) -I$(dumbpath)/include -std=c99
- at HAVE_DUMB_TRUE@ddb_dumb_la_LDFLAGS = -module -lm
+ at HAVE_DUMB_TRUE@ddb_dumb_la_LDFLAGS = -module -avoid-version -lm
 @HAVE_DUMB_TRUE at ddb_dumb_la_SOURCES = \
 @HAVE_DUMB_TRUE at dumb-kode54/src/it/readam.c\
 @HAVE_DUMB_TRUE at dumb-kode54/src/it/readstm.c\
@@ -591,6 +674,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -617,14 +701,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 ddb_dumb.la: $(ddb_dumb_la_OBJECTS) $(ddb_dumb_la_DEPENDENCIES) $(EXTRA_ddb_dumb_la_DEPENDENCIES) 
-	$(ddb_dumb_la_LINK) $(am_ddb_dumb_la_rpath) $(ddb_dumb_la_OBJECTS) $(ddb_dumb_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(ddb_dumb_la_LINK) $(am_ddb_dumb_la_rpath) $(ddb_dumb_la_OBJECTS) $(ddb_dumb_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -705,515 +792,515 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmeffect.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 readam.lo: dumb-kode54/src/it/readam.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readam.lo -MD -MP -MF $(DEPDIR)/readam.Tpo -c -o readam.lo `test -f 'dumb-kode54/src/it/readam.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readam.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/readam.Tpo $(DEPDIR)/readam.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readam.c' object='readam.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readam.lo -MD -MP -MF $(DEPDIR)/readam.Tpo -c -o readam.lo `test -f 'dumb-kode54/src/it/readam.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readam.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readam.Tpo $(DEPDIR)/readam.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/readam.c' object='readam.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readam.lo `test -f 'dumb-kode54/src/it/readam.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readam.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readam.lo `test -f 'dumb-kode54/src/it/readam.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readam.c
 
 readstm.lo: dumb-kode54/src/it/readstm.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readstm.lo -MD -MP -MF $(DEPDIR)/readstm.Tpo -c -o readstm.lo `test -f 'dumb-kode54/src/it/readstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/readstm.Tpo $(DEPDIR)/readstm.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readstm.c' object='readstm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readstm.lo -MD -MP -MF $(DEPDIR)/readstm.Tpo -c -o readstm.lo `test -f 'dumb-kode54/src/it/readstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readstm.Tpo $(DEPDIR)/readstm.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/readstm.c' object='readstm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readstm.lo `test -f 'dumb-kode54/src/it/readstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readstm.lo `test -f 'dumb-kode54/src/it/readstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm.c
 
 loads3m.lo: dumb-kode54/src/it/loads3m.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loads3m.lo -MD -MP -MF $(DEPDIR)/loads3m.Tpo -c -o loads3m.lo `test -f 'dumb-kode54/src/it/loads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loads3m.Tpo $(DEPDIR)/loads3m.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loads3m.c' object='loads3m.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loads3m.lo -MD -MP -MF $(DEPDIR)/loads3m.Tpo -c -o loads3m.lo `test -f 'dumb-kode54/src/it/loads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loads3m.Tpo $(DEPDIR)/loads3m.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loads3m.c' object='loads3m.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loads3m.lo `test -f 'dumb-kode54/src/it/loads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loads3m.lo `test -f 'dumb-kode54/src/it/loads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m.c
 
 loadxm.lo: dumb-kode54/src/it/loadxm.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadxm.lo -MD -MP -MF $(DEPDIR)/loadxm.Tpo -c -o loadxm.lo `test -f 'dumb-kode54/src/it/loadxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadxm.Tpo $(DEPDIR)/loadxm.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadxm.c' object='loadxm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadxm.lo -MD -MP -MF $(DEPDIR)/loadxm.Tpo -c -o loadxm.lo `test -f 'dumb-kode54/src/it/loadxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadxm.Tpo $(DEPDIR)/loadxm.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadxm.c' object='loadxm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadxm.lo `test -f 'dumb-kode54/src/it/loadxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadxm.lo `test -f 'dumb-kode54/src/it/loadxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm.c
 
 ptmeffect.lo: dumb-kode54/src/it/ptmeffect.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptmeffect.lo -MD -MP -MF $(DEPDIR)/ptmeffect.Tpo -c -o ptmeffect.lo `test -f 'dumb-kode54/src/it/ptmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/ptmeffect.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ptmeffect.Tpo $(DEPDIR)/ptmeffect.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/ptmeffect.c' object='ptmeffect.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptmeffect.lo -MD -MP -MF $(DEPDIR)/ptmeffect.Tpo -c -o ptmeffect.lo `test -f 'dumb-kode54/src/it/ptmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/ptmeffect.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ptmeffect.Tpo $(DEPDIR)/ptmeffect.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/ptmeffect.c' object='ptmeffect.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptmeffect.lo `test -f 'dumb-kode54/src/it/ptmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/ptmeffect.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptmeffect.lo `test -f 'dumb-kode54/src/it/ptmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/ptmeffect.c
 
 loadstm.lo: dumb-kode54/src/it/loadstm.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadstm.lo -MD -MP -MF $(DEPDIR)/loadstm.Tpo -c -o loadstm.lo `test -f 'dumb-kode54/src/it/loadstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadstm.Tpo $(DEPDIR)/loadstm.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadstm.c' object='loadstm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadstm.lo -MD -MP -MF $(DEPDIR)/loadstm.Tpo -c -o loadstm.lo `test -f 'dumb-kode54/src/it/loadstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadstm.Tpo $(DEPDIR)/loadstm.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadstm.c' object='loadstm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadstm.lo `test -f 'dumb-kode54/src/it/loadstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadstm.lo `test -f 'dumb-kode54/src/it/loadstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm.c
 
 readxm.lo: dumb-kode54/src/it/readxm.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readxm.lo -MD -MP -MF $(DEPDIR)/readxm.Tpo -c -o readxm.lo `test -f 'dumb-kode54/src/it/readxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/readxm.Tpo $(DEPDIR)/readxm.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readxm.c' object='readxm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readxm.lo -MD -MP -MF $(DEPDIR)/readxm.Tpo -c -o readxm.lo `test -f 'dumb-kode54/src/it/readxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readxm.Tpo $(DEPDIR)/readxm.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/readxm.c' object='readxm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readxm.lo `test -f 'dumb-kode54/src/it/readxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readxm.lo `test -f 'dumb-kode54/src/it/readxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm.c
 
 itorder.lo: dumb-kode54/src/it/itorder.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itorder.lo -MD -MP -MF $(DEPDIR)/itorder.Tpo -c -o itorder.lo `test -f 'dumb-kode54/src/it/itorder.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itorder.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/itorder.Tpo $(DEPDIR)/itorder.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itorder.c' object='itorder.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itorder.lo -MD -MP -MF $(DEPDIR)/itorder.Tpo -c -o itorder.lo `test -f 'dumb-kode54/src/it/itorder.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itorder.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itorder.Tpo $(DEPDIR)/itorder.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/itorder.c' object='itorder.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itorder.lo `test -f 'dumb-kode54/src/it/itorder.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itorder.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itorder.lo `test -f 'dumb-kode54/src/it/itorder.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itorder.c
 
 loadpsm.lo: dumb-kode54/src/it/loadpsm.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadpsm.lo -MD -MP -MF $(DEPDIR)/loadpsm.Tpo -c -o loadpsm.lo `test -f 'dumb-kode54/src/it/loadpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadpsm.Tpo $(DEPDIR)/loadpsm.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadpsm.c' object='loadpsm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadpsm.lo -MD -MP -MF $(DEPDIR)/loadpsm.Tpo -c -o loadpsm.lo `test -f 'dumb-kode54/src/it/loadpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadpsm.Tpo $(DEPDIR)/loadpsm.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadpsm.c' object='loadpsm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadpsm.lo `test -f 'dumb-kode54/src/it/loadpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadpsm.lo `test -f 'dumb-kode54/src/it/loadpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm.c
 
 itload.lo: dumb-kode54/src/it/itload.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itload.lo -MD -MP -MF $(DEPDIR)/itload.Tpo -c -o itload.lo `test -f 'dumb-kode54/src/it/itload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/itload.Tpo $(DEPDIR)/itload.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itload.c' object='itload.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itload.lo -MD -MP -MF $(DEPDIR)/itload.Tpo -c -o itload.lo `test -f 'dumb-kode54/src/it/itload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itload.Tpo $(DEPDIR)/itload.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/itload.c' object='itload.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itload.lo `test -f 'dumb-kode54/src/it/itload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itload.lo `test -f 'dumb-kode54/src/it/itload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload.c
 
 loadasy2.lo: dumb-kode54/src/it/loadasy2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadasy2.lo -MD -MP -MF $(DEPDIR)/loadasy2.Tpo -c -o loadasy2.lo `test -f 'dumb-kode54/src/it/loadasy2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadasy2.Tpo $(DEPDIR)/loadasy2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadasy2.c' object='loadasy2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadasy2.lo -MD -MP -MF $(DEPDIR)/loadasy2.Tpo -c -o loadasy2.lo `test -f 'dumb-kode54/src/it/loadasy2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadasy2.Tpo $(DEPDIR)/loadasy2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadasy2.c' object='loadasy2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadasy2.lo `test -f 'dumb-kode54/src/it/loadasy2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadasy2.lo `test -f 'dumb-kode54/src/it/loadasy2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy2.c
 
 readasy.lo: dumb-kode54/src/it/readasy.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readasy.lo -MD -MP -MF $(DEPDIR)/readasy.Tpo -c -o readasy.lo `test -f 'dumb-kode54/src/it/readasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readasy.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/readasy.Tpo $(DEPDIR)/readasy.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readasy.c' object='readasy.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readasy.lo -MD -MP -MF $(DEPDIR)/readasy.Tpo -c -o readasy.lo `test -f 'dumb-kode54/src/it/readasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readasy.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readasy.Tpo $(DEPDIR)/readasy.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/readasy.c' object='readasy.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readasy.lo `test -f 'dumb-kode54/src/it/readasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readasy.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readasy.lo `test -f 'dumb-kode54/src/it/readasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readasy.c
 
 loadasy.lo: dumb-kode54/src/it/loadasy.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadasy.lo -MD -MP -MF $(DEPDIR)/loadasy.Tpo -c -o loadasy.lo `test -f 'dumb-kode54/src/it/loadasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadasy.Tpo $(DEPDIR)/loadasy.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadasy.c' object='loadasy.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadasy.lo -MD -MP -MF $(DEPDIR)/loadasy.Tpo -c -o loadasy.lo `test -f 'dumb-kode54/src/it/loadasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadasy.Tpo $(DEPDIR)/loadasy.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadasy.c' object='loadasy.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadasy.lo `test -f 'dumb-kode54/src/it/loadasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadasy.lo `test -f 'dumb-kode54/src/it/loadasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy.c
 
 read669.lo: dumb-kode54/src/it/read669.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT read669.lo -MD -MP -MF $(DEPDIR)/read669.Tpo -c -o read669.lo `test -f 'dumb-kode54/src/it/read669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read669.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/read669.Tpo $(DEPDIR)/read669.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/read669.c' object='read669.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT read669.lo -MD -MP -MF $(DEPDIR)/read669.Tpo -c -o read669.lo `test -f 'dumb-kode54/src/it/read669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read669.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/read669.Tpo $(DEPDIR)/read669.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/read669.c' object='read669.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o read669.lo `test -f 'dumb-kode54/src/it/read669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read669.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o read669.lo `test -f 'dumb-kode54/src/it/read669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read669.c
 
 readdsmf.lo: dumb-kode54/src/it/readdsmf.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readdsmf.lo -MD -MP -MF $(DEPDIR)/readdsmf.Tpo -c -o readdsmf.lo `test -f 'dumb-kode54/src/it/readdsmf.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readdsmf.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/readdsmf.Tpo $(DEPDIR)/readdsmf.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readdsmf.c' object='readdsmf.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readdsmf.lo -MD -MP -MF $(DEPDIR)/readdsmf.Tpo -c -o readdsmf.lo `test -f 'dumb-kode54/src/it/readdsmf.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readdsmf.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readdsmf.Tpo $(DEPDIR)/readdsmf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/readdsmf.c' object='readdsmf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readdsmf.lo `test -f 'dumb-kode54/src/it/readdsmf.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readdsmf.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readdsmf.lo `test -f 'dumb-kode54/src/it/readdsmf.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readdsmf.c
 
 reads3m.lo: dumb-kode54/src/it/reads3m.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reads3m.lo -MD -MP -MF $(DEPDIR)/reads3m.Tpo -c -o reads3m.lo `test -f 'dumb-kode54/src/it/reads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/reads3m.Tpo $(DEPDIR)/reads3m.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/reads3m.c' object='reads3m.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reads3m.lo -MD -MP -MF $(DEPDIR)/reads3m.Tpo -c -o reads3m.lo `test -f 'dumb-kode54/src/it/reads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/reads3m.Tpo $(DEPDIR)/reads3m.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/reads3m.c' object='reads3m.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reads3m.lo `test -f 'dumb-kode54/src/it/reads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reads3m.lo `test -f 'dumb-kode54/src/it/reads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m.c
 
 readriff.lo: dumb-kode54/src/it/readriff.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readriff.lo -MD -MP -MF $(DEPDIR)/readriff.Tpo -c -o readriff.lo `test -f 'dumb-kode54/src/it/readriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readriff.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/readriff.Tpo $(DEPDIR)/readriff.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readriff.c' object='readriff.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readriff.lo -MD -MP -MF $(DEPDIR)/readriff.Tpo -c -o readriff.lo `test -f 'dumb-kode54/src/it/readriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readriff.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readriff.Tpo $(DEPDIR)/readriff.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/readriff.c' object='readriff.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readriff.lo `test -f 'dumb-kode54/src/it/readriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readriff.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readriff.lo `test -f 'dumb-kode54/src/it/readriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readriff.c
 
 load6692.lo: dumb-kode54/src/it/load6692.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT load6692.lo -MD -MP -MF $(DEPDIR)/load6692.Tpo -c -o load6692.lo `test -f 'dumb-kode54/src/it/load6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load6692.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/load6692.Tpo $(DEPDIR)/load6692.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/load6692.c' object='load6692.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT load6692.lo -MD -MP -MF $(DEPDIR)/load6692.Tpo -c -o load6692.lo `test -f 'dumb-kode54/src/it/load6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load6692.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/load6692.Tpo $(DEPDIR)/load6692.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/load6692.c' object='load6692.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o load6692.lo `test -f 'dumb-kode54/src/it/load6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load6692.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o load6692.lo `test -f 'dumb-kode54/src/it/load6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load6692.c
 
 read6692.lo: dumb-kode54/src/it/read6692.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT read6692.lo -MD -MP -MF $(DEPDIR)/read6692.Tpo -c -o read6692.lo `test -f 'dumb-kode54/src/it/read6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read6692.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/read6692.Tpo $(DEPDIR)/read6692.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/read6692.c' object='read6692.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT read6692.lo -MD -MP -MF $(DEPDIR)/read6692.Tpo -c -o read6692.lo `test -f 'dumb-kode54/src/it/read6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read6692.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/read6692.Tpo $(DEPDIR)/read6692.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/read6692.c' object='read6692.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o read6692.lo `test -f 'dumb-kode54/src/it/read6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read6692.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o read6692.lo `test -f 'dumb-kode54/src/it/read6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read6692.c
 
 readmod2.lo: dumb-kode54/src/it/readmod2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readmod2.lo -MD -MP -MF $(DEPDIR)/readmod2.Tpo -c -o readmod2.lo `test -f 'dumb-kode54/src/it/readmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/readmod2.Tpo $(DEPDIR)/readmod2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readmod2.c' object='readmod2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readmod2.lo -MD -MP -MF $(DEPDIR)/readmod2.Tpo -c -o readmod2.lo `test -f 'dumb-kode54/src/it/readmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readmod2.Tpo $(DEPDIR)/readmod2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/readmod2.c' object='readmod2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readmod2.lo `test -f 'dumb-kode54/src/it/readmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readmod2.lo `test -f 'dumb-kode54/src/it/readmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod2.c
 
 loadriff2.lo: dumb-kode54/src/it/loadriff2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadriff2.lo -MD -MP -MF $(DEPDIR)/loadriff2.Tpo -c -o loadriff2.lo `test -f 'dumb-kode54/src/it/loadriff2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadriff2.Tpo $(DEPDIR)/loadriff2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadriff2.c' object='loadriff2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadriff2.lo -MD -MP -MF $(DEPDIR)/loadriff2.Tpo -c -o loadriff2.lo `test -f 'dumb-kode54/src/it/loadriff2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadriff2.Tpo $(DEPDIR)/loadriff2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadriff2.c' object='loadriff2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadriff2.lo `test -f 'dumb-kode54/src/it/loadriff2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadriff2.lo `test -f 'dumb-kode54/src/it/loadriff2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff2.c
 
 xmeffect.lo: dumb-kode54/src/it/xmeffect.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmeffect.lo -MD -MP -MF $(DEPDIR)/xmeffect.Tpo -c -o xmeffect.lo `test -f 'dumb-kode54/src/it/xmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/xmeffect.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xmeffect.Tpo $(DEPDIR)/xmeffect.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/xmeffect.c' object='xmeffect.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmeffect.lo -MD -MP -MF $(DEPDIR)/xmeffect.Tpo -c -o xmeffect.lo `test -f 'dumb-kode54/src/it/xmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/xmeffect.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xmeffect.Tpo $(DEPDIR)/xmeffect.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/xmeffect.c' object='xmeffect.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmeffect.lo `test -f 'dumb-kode54/src/it/xmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/xmeffect.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmeffect.lo `test -f 'dumb-kode54/src/it/xmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/xmeffect.c
 
 loadmod2.lo: dumb-kode54/src/it/loadmod2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmod2.lo -MD -MP -MF $(DEPDIR)/loadmod2.Tpo -c -o loadmod2.lo `test -f 'dumb-kode54/src/it/loadmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadmod2.Tpo $(DEPDIR)/loadmod2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadmod2.c' object='loadmod2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmod2.lo -MD -MP -MF $(DEPDIR)/loadmod2.Tpo -c -o loadmod2.lo `test -f 'dumb-kode54/src/it/loadmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadmod2.Tpo $(DEPDIR)/loadmod2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadmod2.c' object='loadmod2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmod2.lo `test -f 'dumb-kode54/src/it/loadmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmod2.lo `test -f 'dumb-kode54/src/it/loadmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod2.c
 
 itread.lo: dumb-kode54/src/it/itread.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itread.lo -MD -MP -MF $(DEPDIR)/itread.Tpo -c -o itread.lo `test -f 'dumb-kode54/src/it/itread.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/itread.Tpo $(DEPDIR)/itread.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itread.c' object='itread.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itread.lo -MD -MP -MF $(DEPDIR)/itread.Tpo -c -o itread.lo `test -f 'dumb-kode54/src/it/itread.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itread.Tpo $(DEPDIR)/itread.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/itread.c' object='itread.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itread.lo `test -f 'dumb-kode54/src/it/itread.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itread.lo `test -f 'dumb-kode54/src/it/itread.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread.c
 
 itunload.lo: dumb-kode54/src/it/itunload.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itunload.lo -MD -MP -MF $(DEPDIR)/itunload.Tpo -c -o itunload.lo `test -f 'dumb-kode54/src/it/itunload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itunload.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/itunload.Tpo $(DEPDIR)/itunload.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itunload.c' object='itunload.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itunload.lo -MD -MP -MF $(DEPDIR)/itunload.Tpo -c -o itunload.lo `test -f 'dumb-kode54/src/it/itunload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itunload.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itunload.Tpo $(DEPDIR)/itunload.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/itunload.c' object='itunload.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itunload.lo `test -f 'dumb-kode54/src/it/itunload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itunload.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itunload.lo `test -f 'dumb-kode54/src/it/itunload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itunload.c
 
 loadmtm2.lo: dumb-kode54/src/it/loadmtm2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmtm2.lo -MD -MP -MF $(DEPDIR)/loadmtm2.Tpo -c -o loadmtm2.lo `test -f 'dumb-kode54/src/it/loadmtm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadmtm2.Tpo $(DEPDIR)/loadmtm2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadmtm2.c' object='loadmtm2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmtm2.lo -MD -MP -MF $(DEPDIR)/loadmtm2.Tpo -c -o loadmtm2.lo `test -f 'dumb-kode54/src/it/loadmtm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadmtm2.Tpo $(DEPDIR)/loadmtm2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadmtm2.c' object='loadmtm2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmtm2.lo `test -f 'dumb-kode54/src/it/loadmtm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmtm2.lo `test -f 'dumb-kode54/src/it/loadmtm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm2.c
 
 loadptm.lo: dumb-kode54/src/it/loadptm.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadptm.lo -MD -MP -MF $(DEPDIR)/loadptm.Tpo -c -o loadptm.lo `test -f 'dumb-kode54/src/it/loadptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadptm.Tpo $(DEPDIR)/loadptm.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadptm.c' object='loadptm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadptm.lo -MD -MP -MF $(DEPDIR)/loadptm.Tpo -c -o loadptm.lo `test -f 'dumb-kode54/src/it/loadptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadptm.Tpo $(DEPDIR)/loadptm.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadptm.c' object='loadptm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadptm.lo `test -f 'dumb-kode54/src/it/loadptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadptm.lo `test -f 'dumb-kode54/src/it/loadptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm.c
 
 itload2.lo: dumb-kode54/src/it/itload2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itload2.lo -MD -MP -MF $(DEPDIR)/itload2.Tpo -c -o itload2.lo `test -f 'dumb-kode54/src/it/itload2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/itload2.Tpo $(DEPDIR)/itload2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itload2.c' object='itload2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itload2.lo -MD -MP -MF $(DEPDIR)/itload2.Tpo -c -o itload2.lo `test -f 'dumb-kode54/src/it/itload2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itload2.Tpo $(DEPDIR)/itload2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/itload2.c' object='itload2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itload2.lo `test -f 'dumb-kode54/src/it/itload2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itload2.lo `test -f 'dumb-kode54/src/it/itload2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload2.c
 
 loadmtm.lo: dumb-kode54/src/it/loadmtm.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmtm.lo -MD -MP -MF $(DEPDIR)/loadmtm.Tpo -c -o loadmtm.lo `test -f 'dumb-kode54/src/it/loadmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadmtm.Tpo $(DEPDIR)/loadmtm.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadmtm.c' object='loadmtm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmtm.lo -MD -MP -MF $(DEPDIR)/loadmtm.Tpo -c -o loadmtm.lo `test -f 'dumb-kode54/src/it/loadmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadmtm.Tpo $(DEPDIR)/loadmtm.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadmtm.c' object='loadmtm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmtm.lo `test -f 'dumb-kode54/src/it/loadmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmtm.lo `test -f 'dumb-kode54/src/it/loadmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm.c
 
 loadoldpsm.lo: dumb-kode54/src/it/loadoldpsm.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadoldpsm.lo -MD -MP -MF $(DEPDIR)/loadoldpsm.Tpo -c -o loadoldpsm.lo `test -f 'dumb-kode54/src/it/loadoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadoldpsm.Tpo $(DEPDIR)/loadoldpsm.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadoldpsm.c' object='loadoldpsm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadoldpsm.lo -MD -MP -MF $(DEPDIR)/loadoldpsm.Tpo -c -o loadoldpsm.lo `test -f 'dumb-kode54/src/it/loadoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadoldpsm.Tpo $(DEPDIR)/loadoldpsm.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadoldpsm.c' object='loadoldpsm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadoldpsm.lo `test -f 'dumb-kode54/src/it/loadoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadoldpsm.lo `test -f 'dumb-kode54/src/it/loadoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm.c
 
 loadstm2.lo: dumb-kode54/src/it/loadstm2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadstm2.lo -MD -MP -MF $(DEPDIR)/loadstm2.Tpo -c -o loadstm2.lo `test -f 'dumb-kode54/src/it/loadstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadstm2.Tpo $(DEPDIR)/loadstm2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadstm2.c' object='loadstm2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadstm2.lo -MD -MP -MF $(DEPDIR)/loadstm2.Tpo -c -o loadstm2.lo `test -f 'dumb-kode54/src/it/loadstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadstm2.Tpo $(DEPDIR)/loadstm2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadstm2.c' object='loadstm2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadstm2.lo `test -f 'dumb-kode54/src/it/loadstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadstm2.lo `test -f 'dumb-kode54/src/it/loadstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm2.c
 
 readstm2.lo: dumb-kode54/src/it/readstm2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readstm2.lo -MD -MP -MF $(DEPDIR)/readstm2.Tpo -c -o readstm2.lo `test -f 'dumb-kode54/src/it/readstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/readstm2.Tpo $(DEPDIR)/readstm2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readstm2.c' object='readstm2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readstm2.lo -MD -MP -MF $(DEPDIR)/readstm2.Tpo -c -o readstm2.lo `test -f 'dumb-kode54/src/it/readstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readstm2.Tpo $(DEPDIR)/readstm2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/readstm2.c' object='readstm2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readstm2.lo `test -f 'dumb-kode54/src/it/readstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readstm2.lo `test -f 'dumb-kode54/src/it/readstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm2.c
 
 readptm.lo: dumb-kode54/src/it/readptm.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readptm.lo -MD -MP -MF $(DEPDIR)/readptm.Tpo -c -o readptm.lo `test -f 'dumb-kode54/src/it/readptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readptm.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/readptm.Tpo $(DEPDIR)/readptm.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readptm.c' object='readptm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readptm.lo -MD -MP -MF $(DEPDIR)/readptm.Tpo -c -o readptm.lo `test -f 'dumb-kode54/src/it/readptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readptm.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readptm.Tpo $(DEPDIR)/readptm.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/readptm.c' object='readptm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readptm.lo `test -f 'dumb-kode54/src/it/readptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readptm.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readptm.lo `test -f 'dumb-kode54/src/it/readptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readptm.c
 
 itrender.lo: dumb-kode54/src/it/itrender.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itrender.lo -MD -MP -MF $(DEPDIR)/itrender.Tpo -c -o itrender.lo `test -f 'dumb-kode54/src/it/itrender.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itrender.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/itrender.Tpo $(DEPDIR)/itrender.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itrender.c' object='itrender.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itrender.lo -MD -MP -MF $(DEPDIR)/itrender.Tpo -c -o itrender.lo `test -f 'dumb-kode54/src/it/itrender.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itrender.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itrender.Tpo $(DEPDIR)/itrender.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/itrender.c' object='itrender.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itrender.lo `test -f 'dumb-kode54/src/it/itrender.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itrender.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itrender.lo `test -f 'dumb-kode54/src/it/itrender.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itrender.c
 
 readoldpsm.lo: dumb-kode54/src/it/readoldpsm.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readoldpsm.lo -MD -MP -MF $(DEPDIR)/readoldpsm.Tpo -c -o readoldpsm.lo `test -f 'dumb-kode54/src/it/readoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readoldpsm.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/readoldpsm.Tpo $(DEPDIR)/readoldpsm.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readoldpsm.c' object='readoldpsm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readoldpsm.lo -MD -MP -MF $(DEPDIR)/readoldpsm.Tpo -c -o readoldpsm.lo `test -f 'dumb-kode54/src/it/readoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readoldpsm.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readoldpsm.Tpo $(DEPDIR)/readoldpsm.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/readoldpsm.c' object='readoldpsm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readoldpsm.lo `test -f 'dumb-kode54/src/it/readoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readoldpsm.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readoldpsm.lo `test -f 'dumb-kode54/src/it/readoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readoldpsm.c
 
 reads3m2.lo: dumb-kode54/src/it/reads3m2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reads3m2.lo -MD -MP -MF $(DEPDIR)/reads3m2.Tpo -c -o reads3m2.lo `test -f 'dumb-kode54/src/it/reads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/reads3m2.Tpo $(DEPDIR)/reads3m2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/reads3m2.c' object='reads3m2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reads3m2.lo -MD -MP -MF $(DEPDIR)/reads3m2.Tpo -c -o reads3m2.lo `test -f 'dumb-kode54/src/it/reads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/reads3m2.Tpo $(DEPDIR)/reads3m2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/reads3m2.c' object='reads3m2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reads3m2.lo `test -f 'dumb-kode54/src/it/reads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reads3m2.lo `test -f 'dumb-kode54/src/it/reads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m2.c
 
 readpsm.lo: dumb-kode54/src/it/readpsm.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readpsm.lo -MD -MP -MF $(DEPDIR)/readpsm.Tpo -c -o readpsm.lo `test -f 'dumb-kode54/src/it/readpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readpsm.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/readpsm.Tpo $(DEPDIR)/readpsm.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readpsm.c' object='readpsm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readpsm.lo -MD -MP -MF $(DEPDIR)/readpsm.Tpo -c -o readpsm.lo `test -f 'dumb-kode54/src/it/readpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readpsm.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readpsm.Tpo $(DEPDIR)/readpsm.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/readpsm.c' object='readpsm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readpsm.lo `test -f 'dumb-kode54/src/it/readpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readpsm.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readpsm.lo `test -f 'dumb-kode54/src/it/readpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readpsm.c
 
 itread2.lo: dumb-kode54/src/it/itread2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itread2.lo -MD -MP -MF $(DEPDIR)/itread2.Tpo -c -o itread2.lo `test -f 'dumb-kode54/src/it/itread2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/itread2.Tpo $(DEPDIR)/itread2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itread2.c' object='itread2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itread2.lo -MD -MP -MF $(DEPDIR)/itread2.Tpo -c -o itread2.lo `test -f 'dumb-kode54/src/it/itread2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itread2.Tpo $(DEPDIR)/itread2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/itread2.c' object='itread2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itread2.lo `test -f 'dumb-kode54/src/it/itread2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itread2.lo `test -f 'dumb-kode54/src/it/itread2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread2.c
 
 loads3m2.lo: dumb-kode54/src/it/loads3m2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loads3m2.lo -MD -MP -MF $(DEPDIR)/loads3m2.Tpo -c -o loads3m2.lo `test -f 'dumb-kode54/src/it/loads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loads3m2.Tpo $(DEPDIR)/loads3m2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loads3m2.c' object='loads3m2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loads3m2.lo -MD -MP -MF $(DEPDIR)/loads3m2.Tpo -c -o loads3m2.lo `test -f 'dumb-kode54/src/it/loads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loads3m2.Tpo $(DEPDIR)/loads3m2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loads3m2.c' object='loads3m2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loads3m2.lo `test -f 'dumb-kode54/src/it/loads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loads3m2.lo `test -f 'dumb-kode54/src/it/loads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m2.c
 
 loadpsm2.lo: dumb-kode54/src/it/loadpsm2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadpsm2.lo -MD -MP -MF $(DEPDIR)/loadpsm2.Tpo -c -o loadpsm2.lo `test -f 'dumb-kode54/src/it/loadpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadpsm2.Tpo $(DEPDIR)/loadpsm2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadpsm2.c' object='loadpsm2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadpsm2.lo -MD -MP -MF $(DEPDIR)/loadpsm2.Tpo -c -o loadpsm2.lo `test -f 'dumb-kode54/src/it/loadpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadpsm2.Tpo $(DEPDIR)/loadpsm2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadpsm2.c' object='loadpsm2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadpsm2.lo `test -f 'dumb-kode54/src/it/loadpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadpsm2.lo `test -f 'dumb-kode54/src/it/loadpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm2.c
 
 loadxm2.lo: dumb-kode54/src/it/loadxm2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadxm2.lo -MD -MP -MF $(DEPDIR)/loadxm2.Tpo -c -o loadxm2.lo `test -f 'dumb-kode54/src/it/loadxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadxm2.Tpo $(DEPDIR)/loadxm2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadxm2.c' object='loadxm2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadxm2.lo -MD -MP -MF $(DEPDIR)/loadxm2.Tpo -c -o loadxm2.lo `test -f 'dumb-kode54/src/it/loadxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadxm2.Tpo $(DEPDIR)/loadxm2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadxm2.c' object='loadxm2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadxm2.lo `test -f 'dumb-kode54/src/it/loadxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadxm2.lo `test -f 'dumb-kode54/src/it/loadxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm2.c
 
 loadptm2.lo: dumb-kode54/src/it/loadptm2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadptm2.lo -MD -MP -MF $(DEPDIR)/loadptm2.Tpo -c -o loadptm2.lo `test -f 'dumb-kode54/src/it/loadptm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadptm2.Tpo $(DEPDIR)/loadptm2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadptm2.c' object='loadptm2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadptm2.lo -MD -MP -MF $(DEPDIR)/loadptm2.Tpo -c -o loadptm2.lo `test -f 'dumb-kode54/src/it/loadptm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadptm2.Tpo $(DEPDIR)/loadptm2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadptm2.c' object='loadptm2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadptm2.lo `test -f 'dumb-kode54/src/it/loadptm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadptm2.lo `test -f 'dumb-kode54/src/it/loadptm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm2.c
 
 readxm2.lo: dumb-kode54/src/it/readxm2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readxm2.lo -MD -MP -MF $(DEPDIR)/readxm2.Tpo -c -o readxm2.lo `test -f 'dumb-kode54/src/it/readxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/readxm2.Tpo $(DEPDIR)/readxm2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readxm2.c' object='readxm2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readxm2.lo -MD -MP -MF $(DEPDIR)/readxm2.Tpo -c -o readxm2.lo `test -f 'dumb-kode54/src/it/readxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readxm2.Tpo $(DEPDIR)/readxm2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/readxm2.c' object='readxm2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readxm2.lo `test -f 'dumb-kode54/src/it/readxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readxm2.lo `test -f 'dumb-kode54/src/it/readxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm2.c
 
 itmisc.lo: dumb-kode54/src/it/itmisc.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itmisc.lo -MD -MP -MF $(DEPDIR)/itmisc.Tpo -c -o itmisc.lo `test -f 'dumb-kode54/src/it/itmisc.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itmisc.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/itmisc.Tpo $(DEPDIR)/itmisc.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itmisc.c' object='itmisc.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itmisc.lo -MD -MP -MF $(DEPDIR)/itmisc.Tpo -c -o itmisc.lo `test -f 'dumb-kode54/src/it/itmisc.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itmisc.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itmisc.Tpo $(DEPDIR)/itmisc.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/itmisc.c' object='itmisc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itmisc.lo `test -f 'dumb-kode54/src/it/itmisc.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itmisc.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itmisc.lo `test -f 'dumb-kode54/src/it/itmisc.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itmisc.c
 
 loadoldpsm2.lo: dumb-kode54/src/it/loadoldpsm2.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadoldpsm2.lo -MD -MP -MF $(DEPDIR)/loadoldpsm2.Tpo -c -o loadoldpsm2.lo `test -f 'dumb-kode54/src/it/loadoldpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm2.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadoldpsm2.Tpo $(DEPDIR)/loadoldpsm2.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadoldpsm2.c' object='loadoldpsm2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadoldpsm2.lo -MD -MP -MF $(DEPDIR)/loadoldpsm2.Tpo -c -o loadoldpsm2.lo `test -f 'dumb-kode54/src/it/loadoldpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadoldpsm2.Tpo $(DEPDIR)/loadoldpsm2.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadoldpsm2.c' object='loadoldpsm2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadoldpsm2.lo `test -f 'dumb-kode54/src/it/loadoldpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadoldpsm2.lo `test -f 'dumb-kode54/src/it/loadoldpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm2.c
 
 readmod.lo: dumb-kode54/src/it/readmod.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readmod.lo -MD -MP -MF $(DEPDIR)/readmod.Tpo -c -o readmod.lo `test -f 'dumb-kode54/src/it/readmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/readmod.Tpo $(DEPDIR)/readmod.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readmod.c' object='readmod.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readmod.lo -MD -MP -MF $(DEPDIR)/readmod.Tpo -c -o readmod.lo `test -f 'dumb-kode54/src/it/readmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readmod.Tpo $(DEPDIR)/readmod.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/readmod.c' object='readmod.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readmod.lo `test -f 'dumb-kode54/src/it/readmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readmod.lo `test -f 'dumb-kode54/src/it/readmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod.c
 
 loadmod.lo: dumb-kode54/src/it/loadmod.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmod.lo -MD -MP -MF $(DEPDIR)/loadmod.Tpo -c -o loadmod.lo `test -f 'dumb-kode54/src/it/loadmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadmod.Tpo $(DEPDIR)/loadmod.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadmod.c' object='loadmod.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmod.lo -MD -MP -MF $(DEPDIR)/loadmod.Tpo -c -o loadmod.lo `test -f 'dumb-kode54/src/it/loadmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadmod.Tpo $(DEPDIR)/loadmod.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadmod.c' object='loadmod.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmod.lo `test -f 'dumb-kode54/src/it/loadmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmod.lo `test -f 'dumb-kode54/src/it/loadmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod.c
 
 loadriff.lo: dumb-kode54/src/it/loadriff.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadriff.lo -MD -MP -MF $(DEPDIR)/loadriff.Tpo -c -o loadriff.lo `test -f 'dumb-kode54/src/it/loadriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadriff.Tpo $(DEPDIR)/loadriff.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadriff.c' object='loadriff.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadriff.lo -MD -MP -MF $(DEPDIR)/loadriff.Tpo -c -o loadriff.lo `test -f 'dumb-kode54/src/it/loadriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadriff.Tpo $(DEPDIR)/loadriff.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/loadriff.c' object='loadriff.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadriff.lo `test -f 'dumb-kode54/src/it/loadriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadriff.lo `test -f 'dumb-kode54/src/it/loadriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff.c
 
 readmtm.lo: dumb-kode54/src/it/readmtm.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readmtm.lo -MD -MP -MF $(DEPDIR)/readmtm.Tpo -c -o readmtm.lo `test -f 'dumb-kode54/src/it/readmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmtm.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/readmtm.Tpo $(DEPDIR)/readmtm.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readmtm.c' object='readmtm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readmtm.lo -MD -MP -MF $(DEPDIR)/readmtm.Tpo -c -o readmtm.lo `test -f 'dumb-kode54/src/it/readmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmtm.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readmtm.Tpo $(DEPDIR)/readmtm.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/readmtm.c' object='readmtm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readmtm.lo `test -f 'dumb-kode54/src/it/readmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmtm.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readmtm.lo `test -f 'dumb-kode54/src/it/readmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmtm.c
 
 load669.lo: dumb-kode54/src/it/load669.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT load669.lo -MD -MP -MF $(DEPDIR)/load669.Tpo -c -o load669.lo `test -f 'dumb-kode54/src/it/load669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load669.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/load669.Tpo $(DEPDIR)/load669.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/load669.c' object='load669.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT load669.lo -MD -MP -MF $(DEPDIR)/load669.Tpo -c -o load669.lo `test -f 'dumb-kode54/src/it/load669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load669.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/load669.Tpo $(DEPDIR)/load669.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/it/load669.c' object='load669.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o load669.lo `test -f 'dumb-kode54/src/it/load669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load669.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o load669.lo `test -f 'dumb-kode54/src/it/load669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load669.c
 
 rendduh.lo: dumb-kode54/src/core/rendduh.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rendduh.lo -MD -MP -MF $(DEPDIR)/rendduh.Tpo -c -o rendduh.lo `test -f 'dumb-kode54/src/core/rendduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendduh.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rendduh.Tpo $(DEPDIR)/rendduh.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/rendduh.c' object='rendduh.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rendduh.lo -MD -MP -MF $(DEPDIR)/rendduh.Tpo -c -o rendduh.lo `test -f 'dumb-kode54/src/core/rendduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendduh.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rendduh.Tpo $(DEPDIR)/rendduh.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/core/rendduh.c' object='rendduh.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rendduh.lo `test -f 'dumb-kode54/src/core/rendduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendduh.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rendduh.lo `test -f 'dumb-kode54/src/core/rendduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendduh.c
 
 readduh.lo: dumb-kode54/src/core/readduh.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readduh.lo -MD -MP -MF $(DEPDIR)/readduh.Tpo -c -o readduh.lo `test -f 'dumb-kode54/src/core/readduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/readduh.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/readduh.Tpo $(DEPDIR)/readduh.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/readduh.c' object='readduh.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readduh.lo -MD -MP -MF $(DEPDIR)/readduh.Tpo -c -o readduh.lo `test -f 'dumb-kode54/src/core/readduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/readduh.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readduh.Tpo $(DEPDIR)/readduh.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/core/readduh.c' object='readduh.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readduh.lo `test -f 'dumb-kode54/src/core/readduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/readduh.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readduh.lo `test -f 'dumb-kode54/src/core/readduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/readduh.c
 
 duhlen.lo: dumb-kode54/src/core/duhlen.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT duhlen.lo -MD -MP -MF $(DEPDIR)/duhlen.Tpo -c -o duhlen.lo `test -f 'dumb-kode54/src/core/duhlen.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhlen.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/duhlen.Tpo $(DEPDIR)/duhlen.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/duhlen.c' object='duhlen.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT duhlen.lo -MD -MP -MF $(DEPDIR)/duhlen.Tpo -c -o duhlen.lo `test -f 'dumb-kode54/src/core/duhlen.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhlen.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/duhlen.Tpo $(DEPDIR)/duhlen.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/core/duhlen.c' object='duhlen.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o duhlen.lo `test -f 'dumb-kode54/src/core/duhlen.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhlen.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o duhlen.lo `test -f 'dumb-kode54/src/core/duhlen.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhlen.c
 
 loadduh.lo: dumb-kode54/src/core/loadduh.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadduh.lo -MD -MP -MF $(DEPDIR)/loadduh.Tpo -c -o loadduh.lo `test -f 'dumb-kode54/src/core/loadduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/loadduh.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/loadduh.Tpo $(DEPDIR)/loadduh.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/loadduh.c' object='loadduh.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadduh.lo -MD -MP -MF $(DEPDIR)/loadduh.Tpo -c -o loadduh.lo `test -f 'dumb-kode54/src/core/loadduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/loadduh.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadduh.Tpo $(DEPDIR)/loadduh.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/core/loadduh.c' object='loadduh.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadduh.lo `test -f 'dumb-kode54/src/core/loadduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/loadduh.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadduh.lo `test -f 'dumb-kode54/src/core/loadduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/loadduh.c
 
 unload.lo: dumb-kode54/src/core/unload.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unload.lo -MD -MP -MF $(DEPDIR)/unload.Tpo -c -o unload.lo `test -f 'dumb-kode54/src/core/unload.c' || echo '$(srcdir)/'`dumb-kode54/src/core/unload.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/unload.Tpo $(DEPDIR)/unload.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/unload.c' object='unload.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unload.lo -MD -MP -MF $(DEPDIR)/unload.Tpo -c -o unload.lo `test -f 'dumb-kode54/src/core/unload.c' || echo '$(srcdir)/'`dumb-kode54/src/core/unload.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unload.Tpo $(DEPDIR)/unload.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/core/unload.c' object='unload.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unload.lo `test -f 'dumb-kode54/src/core/unload.c' || echo '$(srcdir)/'`dumb-kode54/src/core/unload.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unload.lo `test -f 'dumb-kode54/src/core/unload.c' || echo '$(srcdir)/'`dumb-kode54/src/core/unload.c
 
 duhtag.lo: dumb-kode54/src/core/duhtag.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT duhtag.lo -MD -MP -MF $(DEPDIR)/duhtag.Tpo -c -o duhtag.lo `test -f 'dumb-kode54/src/core/duhtag.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhtag.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/duhtag.Tpo $(DEPDIR)/duhtag.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/duhtag.c' object='duhtag.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT duhtag.lo -MD -MP -MF $(DEPDIR)/duhtag.Tpo -c -o duhtag.lo `test -f 'dumb-kode54/src/core/duhtag.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhtag.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/duhtag.Tpo $(DEPDIR)/duhtag.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/core/duhtag.c' object='duhtag.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o duhtag.lo `test -f 'dumb-kode54/src/core/duhtag.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhtag.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o duhtag.lo `test -f 'dumb-kode54/src/core/duhtag.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhtag.c
 
 register.lo: dumb-kode54/src/core/register.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT register.lo -MD -MP -MF $(DEPDIR)/register.Tpo -c -o register.lo `test -f 'dumb-kode54/src/core/register.c' || echo '$(srcdir)/'`dumb-kode54/src/core/register.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/register.Tpo $(DEPDIR)/register.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/register.c' object='register.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT register.lo -MD -MP -MF $(DEPDIR)/register.Tpo -c -o register.lo `test -f 'dumb-kode54/src/core/register.c' || echo '$(srcdir)/'`dumb-kode54/src/core/register.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/register.Tpo $(DEPDIR)/register.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/core/register.c' object='register.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o register.lo `test -f 'dumb-kode54/src/core/register.c' || echo '$(srcdir)/'`dumb-kode54/src/core/register.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o register.lo `test -f 'dumb-kode54/src/core/register.c' || echo '$(srcdir)/'`dumb-kode54/src/core/register.c
 
 rawsig.lo: dumb-kode54/src/core/rawsig.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rawsig.lo -MD -MP -MF $(DEPDIR)/rawsig.Tpo -c -o rawsig.lo `test -f 'dumb-kode54/src/core/rawsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rawsig.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rawsig.Tpo $(DEPDIR)/rawsig.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/rawsig.c' object='rawsig.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rawsig.lo -MD -MP -MF $(DEPDIR)/rawsig.Tpo -c -o rawsig.lo `test -f 'dumb-kode54/src/core/rawsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rawsig.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rawsig.Tpo $(DEPDIR)/rawsig.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/core/rawsig.c' object='rawsig.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rawsig.lo `test -f 'dumb-kode54/src/core/rawsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rawsig.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rawsig.lo `test -f 'dumb-kode54/src/core/rawsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rawsig.c
 
 dumbfile.lo: dumb-kode54/src/core/dumbfile.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dumbfile.lo -MD -MP -MF $(DEPDIR)/dumbfile.Tpo -c -o dumbfile.lo `test -f 'dumb-kode54/src/core/dumbfile.c' || echo '$(srcdir)/'`dumb-kode54/src/core/dumbfile.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dumbfile.Tpo $(DEPDIR)/dumbfile.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/dumbfile.c' object='dumbfile.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dumbfile.lo -MD -MP -MF $(DEPDIR)/dumbfile.Tpo -c -o dumbfile.lo `test -f 'dumb-kode54/src/core/dumbfile.c' || echo '$(srcdir)/'`dumb-kode54/src/core/dumbfile.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dumbfile.Tpo $(DEPDIR)/dumbfile.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/core/dumbfile.c' object='dumbfile.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dumbfile.lo `test -f 'dumb-kode54/src/core/dumbfile.c' || echo '$(srcdir)/'`dumb-kode54/src/core/dumbfile.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dumbfile.lo `test -f 'dumb-kode54/src/core/dumbfile.c' || echo '$(srcdir)/'`dumb-kode54/src/core/dumbfile.c
 
 rendsig.lo: dumb-kode54/src/core/rendsig.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rendsig.lo -MD -MP -MF $(DEPDIR)/rendsig.Tpo -c -o rendsig.lo `test -f 'dumb-kode54/src/core/rendsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendsig.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rendsig.Tpo $(DEPDIR)/rendsig.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/rendsig.c' object='rendsig.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rendsig.lo -MD -MP -MF $(DEPDIR)/rendsig.Tpo -c -o rendsig.lo `test -f 'dumb-kode54/src/core/rendsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendsig.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rendsig.Tpo $(DEPDIR)/rendsig.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/core/rendsig.c' object='rendsig.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rendsig.lo `test -f 'dumb-kode54/src/core/rendsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendsig.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rendsig.lo `test -f 'dumb-kode54/src/core/rendsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendsig.c
 
 makeduh.lo: dumb-kode54/src/core/makeduh.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT makeduh.lo -MD -MP -MF $(DEPDIR)/makeduh.Tpo -c -o makeduh.lo `test -f 'dumb-kode54/src/core/makeduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/makeduh.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makeduh.Tpo $(DEPDIR)/makeduh.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/makeduh.c' object='makeduh.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT makeduh.lo -MD -MP -MF $(DEPDIR)/makeduh.Tpo -c -o makeduh.lo `test -f 'dumb-kode54/src/core/makeduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/makeduh.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/makeduh.Tpo $(DEPDIR)/makeduh.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/core/makeduh.c' object='makeduh.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o makeduh.lo `test -f 'dumb-kode54/src/core/makeduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/makeduh.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o makeduh.lo `test -f 'dumb-kode54/src/core/makeduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/makeduh.c
 
 atexit.lo: dumb-kode54/src/core/atexit.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atexit.lo -MD -MP -MF $(DEPDIR)/atexit.Tpo -c -o atexit.lo `test -f 'dumb-kode54/src/core/atexit.c' || echo '$(srcdir)/'`dumb-kode54/src/core/atexit.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/atexit.Tpo $(DEPDIR)/atexit.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/atexit.c' object='atexit.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atexit.lo -MD -MP -MF $(DEPDIR)/atexit.Tpo -c -o atexit.lo `test -f 'dumb-kode54/src/core/atexit.c' || echo '$(srcdir)/'`dumb-kode54/src/core/atexit.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/atexit.Tpo $(DEPDIR)/atexit.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/core/atexit.c' object='atexit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atexit.lo `test -f 'dumb-kode54/src/core/atexit.c' || echo '$(srcdir)/'`dumb-kode54/src/core/atexit.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atexit.lo `test -f 'dumb-kode54/src/core/atexit.c' || echo '$(srcdir)/'`dumb-kode54/src/core/atexit.c
 
 clickrem.lo: dumb-kode54/src/helpers/clickrem.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clickrem.lo -MD -MP -MF $(DEPDIR)/clickrem.Tpo -c -o clickrem.lo `test -f 'dumb-kode54/src/helpers/clickrem.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/clickrem.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/clickrem.Tpo $(DEPDIR)/clickrem.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/clickrem.c' object='clickrem.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clickrem.lo -MD -MP -MF $(DEPDIR)/clickrem.Tpo -c -o clickrem.lo `test -f 'dumb-kode54/src/helpers/clickrem.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/clickrem.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clickrem.Tpo $(DEPDIR)/clickrem.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/helpers/clickrem.c' object='clickrem.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clickrem.lo `test -f 'dumb-kode54/src/helpers/clickrem.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/clickrem.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clickrem.lo `test -f 'dumb-kode54/src/helpers/clickrem.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/clickrem.c
 
 silence.lo: dumb-kode54/src/helpers/silence.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT silence.lo -MD -MP -MF $(DEPDIR)/silence.Tpo -c -o silence.lo `test -f 'dumb-kode54/src/helpers/silence.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/silence.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/silence.Tpo $(DEPDIR)/silence.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/silence.c' object='silence.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT silence.lo -MD -MP -MF $(DEPDIR)/silence.Tpo -c -o silence.lo `test -f 'dumb-kode54/src/helpers/silence.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/silence.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/silence.Tpo $(DEPDIR)/silence.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/helpers/silence.c' object='silence.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o silence.lo `test -f 'dumb-kode54/src/helpers/silence.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/silence.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o silence.lo `test -f 'dumb-kode54/src/helpers/silence.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/silence.c
 
 stdfile.lo: dumb-kode54/src/helpers/stdfile.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdfile.lo -MD -MP -MF $(DEPDIR)/stdfile.Tpo -c -o stdfile.lo `test -f 'dumb-kode54/src/helpers/stdfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/stdfile.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/stdfile.Tpo $(DEPDIR)/stdfile.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/stdfile.c' object='stdfile.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdfile.lo -MD -MP -MF $(DEPDIR)/stdfile.Tpo -c -o stdfile.lo `test -f 'dumb-kode54/src/helpers/stdfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/stdfile.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/stdfile.Tpo $(DEPDIR)/stdfile.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/helpers/stdfile.c' object='stdfile.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdfile.lo `test -f 'dumb-kode54/src/helpers/stdfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/stdfile.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdfile.lo `test -f 'dumb-kode54/src/helpers/stdfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/stdfile.c
 
 resample.lo: dumb-kode54/src/helpers/resample.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT resample.lo -MD -MP -MF $(DEPDIR)/resample.Tpo -c -o resample.lo `test -f 'dumb-kode54/src/helpers/resample.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/resample.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/resample.Tpo $(DEPDIR)/resample.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/resample.c' object='resample.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT resample.lo -MD -MP -MF $(DEPDIR)/resample.Tpo -c -o resample.lo `test -f 'dumb-kode54/src/helpers/resample.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/resample.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/resample.Tpo $(DEPDIR)/resample.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/helpers/resample.c' object='resample.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o resample.lo `test -f 'dumb-kode54/src/helpers/resample.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/resample.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o resample.lo `test -f 'dumb-kode54/src/helpers/resample.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/resample.c
 
 riff.lo: dumb-kode54/src/helpers/riff.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT riff.lo -MD -MP -MF $(DEPDIR)/riff.Tpo -c -o riff.lo `test -f 'dumb-kode54/src/helpers/riff.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/riff.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/riff.Tpo $(DEPDIR)/riff.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/riff.c' object='riff.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT riff.lo -MD -MP -MF $(DEPDIR)/riff.Tpo -c -o riff.lo `test -f 'dumb-kode54/src/helpers/riff.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/riff.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/riff.Tpo $(DEPDIR)/riff.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/helpers/riff.c' object='riff.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o riff.lo `test -f 'dumb-kode54/src/helpers/riff.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/riff.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o riff.lo `test -f 'dumb-kode54/src/helpers/riff.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/riff.c
 
 memfile.lo: dumb-kode54/src/helpers/memfile.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT memfile.lo -MD -MP -MF $(DEPDIR)/memfile.Tpo -c -o memfile.lo `test -f 'dumb-kode54/src/helpers/memfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/memfile.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/memfile.Tpo $(DEPDIR)/memfile.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/memfile.c' object='memfile.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT memfile.lo -MD -MP -MF $(DEPDIR)/memfile.Tpo -c -o memfile.lo `test -f 'dumb-kode54/src/helpers/memfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/memfile.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/memfile.Tpo $(DEPDIR)/memfile.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/helpers/memfile.c' object='memfile.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o memfile.lo `test -f 'dumb-kode54/src/helpers/memfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/memfile.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o memfile.lo `test -f 'dumb-kode54/src/helpers/memfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/memfile.c
 
 sampbuf.lo: dumb-kode54/src/helpers/sampbuf.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sampbuf.lo -MD -MP -MF $(DEPDIR)/sampbuf.Tpo -c -o sampbuf.lo `test -f 'dumb-kode54/src/helpers/sampbuf.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/sampbuf.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/sampbuf.Tpo $(DEPDIR)/sampbuf.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/sampbuf.c' object='sampbuf.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sampbuf.lo -MD -MP -MF $(DEPDIR)/sampbuf.Tpo -c -o sampbuf.lo `test -f 'dumb-kode54/src/helpers/sampbuf.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/sampbuf.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sampbuf.Tpo $(DEPDIR)/sampbuf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/helpers/sampbuf.c' object='sampbuf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sampbuf.lo `test -f 'dumb-kode54/src/helpers/sampbuf.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/sampbuf.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sampbuf.lo `test -f 'dumb-kode54/src/helpers/sampbuf.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/sampbuf.c
 
 barray.lo: dumb-kode54/src/helpers/barray.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT barray.lo -MD -MP -MF $(DEPDIR)/barray.Tpo -c -o barray.lo `test -f 'dumb-kode54/src/helpers/barray.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/barray.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/barray.Tpo $(DEPDIR)/barray.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/barray.c' object='barray.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT barray.lo -MD -MP -MF $(DEPDIR)/barray.Tpo -c -o barray.lo `test -f 'dumb-kode54/src/helpers/barray.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/barray.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/barray.Tpo $(DEPDIR)/barray.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dumb-kode54/src/helpers/barray.c' object='barray.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o barray.lo `test -f 'dumb-kode54/src/helpers/barray.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/barray.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o barray.lo `test -f 'dumb-kode54/src/helpers/barray.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/barray.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1221,26 +1308,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1252,15 +1328,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1269,6 +1341,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1413,19 +1500,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/dumb/cdumb.c b/plugins/dumb/cdumb.c
index dfd9ec5..017b850 100644
--- a/plugins/dumb/cdumb.c
+++ b/plugins/dumb/cdumb.c
@@ -1,19 +1,24 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    DUMB Plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 2 of the License, or
-    (at your option) any later version.
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
 
-    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.
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
 
 // based on fb2k dumb plugin from http://kode54.foobar2000.org
@@ -121,6 +126,8 @@ cdumb_startrenderer (DB_fileinfo_t *_info) {
     dumb_it_set_resampling_quality (itsr, q);
     dumb_it_set_xm_speed_zero_callback (itsr, &dumb_it_callback_terminate, NULL);
     dumb_it_set_global_volume_zero_callback (itsr, &dumb_it_callback_terminate, NULL);
+
+    dumb_it_sr_set_global_volume (itsr, deadbeef->conf_get_int ("dumb.globalvolume", 64));
     return 0;
 }
 
@@ -884,6 +891,7 @@ cgme_stop (void) {
 static const char settings_dlg[] =
     "property \"Resampling quality (0..2, higher is better)\" entry dumb.resampling_quality 2;\n"
     "property \"8-bit output (default is 16)\" checkbox dumb.8bitoutput 0;\n"
+    "property \"Internal DUMB volume (0..128)\" spinbtn[0,128,16] dumb.globalvolume 64;\n"
 ;
 
 // define plugin interface
@@ -897,25 +905,30 @@ static DB_decoder_t plugin = {
     .plugin.name = "DUMB module player",
     .plugin.descr = "module player based on DUMB library",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "DUMB Plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>\n"
         "\n"
         "Uses a fork of DUMB (Dynamic Universal Music Bibliotheque), Version 0.9.3\n"
         "Copyright (C) 2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere\n"
         "Uses code from kode54's foobar2000 plugin, http://kode54.foobar2000.org/\n"
         "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "This software is provided 'as-is', without any express or implied\n"
+        "warranty.  In no event will the authors be held liable for any damages\n"
+        "arising from the use of this software.\n"
+        "\n"
+        "Permission is granted to anyone to use this software for any purpose,\n"
+        "including commercial applications, and to alter it and redistribute it\n"
+        "freely, subject to the following restrictions:\n"
+        "\n"
+        "1. The origin of this software must not be misrepresented; you must not\n"
+        " claim that you wrote the original software. If you use this software\n"
+        " in a product, an acknowledgment in the product documentation would be\n"
+        " appreciated but is not required.\n"
         "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
+        "2. Altered source versions must be plainly marked as such, and must not be\n"
+        " misrepresented as being the original software.\n"
         "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "3. This notice may not be removed or altered from any source distribution.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .plugin.start = cgme_start,
diff --git a/plugins/dumb/dumb-kode54/src/it/itrender.c b/plugins/dumb/dumb-kode54/src/it/itrender.c
index 28c1fd8..95d8031 100644
--- a/plugins/dumb/dumb-kode54/src/it/itrender.c
+++ b/plugins/dumb/dumb-kode54/src/it/itrender.c
@@ -17,10 +17,6 @@
  *                                                       \__/
  */
 
-#ifdef HAVE_CONFIG_H
-#include "../../../../../config.h"
-#endif
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
@@ -3564,14 +3560,12 @@ static void process_playing(DUMB_IT_SIGRENDERER *sigrenderer, IT_PLAYING *playin
 	playing->sample_vibrato_time += playing->sample->vibrato_speed;
 }
 
-#ifndef HAVE_LOG2
-static inline float log2(float x) {return (float)log(x)/M_LN2;}
-#endif
+static inline float dumb_log2(float x) {return (float)log(x)/M_LN2;}
 
 static int delta_to_note(float delta, int base)
 {
 	float note;
-	note = log2(delta * 65536.f / (float)base)*12.0f+60.5f;
+	note = dumb_log2(delta * 65536.f / (float)base)*12.0f+60.5f;
 	if (note > 119) note = 119;
 	else if (note < 0) note = 0;
 	return (int)note;
diff --git a/plugins/ffap/COPYING b/plugins/ffap/COPYING
new file mode 100644
index 0000000..a85ee5d
--- /dev/null
+++ b/plugins/ffap/COPYING
@@ -0,0 +1,18 @@
+APE / Monkey's Audio plugin for DeaDBeeF
+Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
+based on apedec from FFMpeg Copyright (c) 2007 Benjamin Zores <ben at geexbox.org>
+based upon libdemac from Dave Chapman.
+
+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.
diff --git a/plugins/ffap/Makefile.am b/plugins/ffap/Makefile.am
index 24cd790..ca2e728 100644
--- a/plugins/ffap/Makefile.am
+++ b/plugins/ffap/Makefile.am
@@ -23,7 +23,7 @@ if APE_USE_YASM
 endif
 endif
 
-ffap_la_LDFLAGS = -module -lm
+ffap_la_LDFLAGS = -module -avoid-version -lm
 
 AM_CFLAGS = $(CFLAGS) -fPIC -std=c99
 endif
diff --git a/plugins/ffap/Makefile.in b/plugins/ffap/Makefile.in
index b4fc387..af7b0cc 100644
--- a/plugins/ffap/Makefile.in
+++ b/plugins/ffap/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/ffap
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -114,23 +142,48 @@ am__ffap_la_SOURCES_DIST = ffap.c dsputil_yasm.asm
 @APE_USE_YASM_TRUE@@HAVE_FFAP_TRUE@@HAVE_YASM_TRUE at am__objects_1 = dsputil_yasm.lo
 @HAVE_FFAP_TRUE at am_ffap_la_OBJECTS = ffap.lo $(am__objects_1)
 ffap_la_OBJECTS = $(am_ffap_la_OBJECTS)
-ffap_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ffap_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+ffap_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(ffap_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_FFAP_TRUE at am_ffap_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(ffap_la_SOURCES)
 DIST_SOURCES = $(am__ffap_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,6 +191,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,6 +234,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -184,10 +255,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -210,6 +283,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -263,6 +337,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -281,6 +356,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -306,13 +383,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -321,7 +402,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -388,7 +471,7 @@ top_srcdir = @top_srcdir@
 @APE_USE_YASM_TRUE@@HAVE_FFAP_TRUE@@HAVE_YASM_TRUE at INTEL_SRC = dsputil_yasm.asm
 @APE_USE_YASM_TRUE@@HAVE_FFAP_TRUE@@HAVE_YASM_TRUE at ffap_la_DEPENDENCIES = dsputil_yasm.lo
 @HAVE_FFAP_TRUE at ffap_la_SOURCES = ffap.c $(INTEL_SRC)
- at HAVE_FFAP_TRUE@ffap_la_LDFLAGS = -module -lm
+ at HAVE_FFAP_TRUE@ffap_la_LDFLAGS = -module -avoid-version -lm
 @HAVE_FFAP_TRUE at AM_CFLAGS = $(CFLAGS) -fPIC -std=c99
 all: all-am
 
@@ -424,6 +507,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -450,14 +534,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 ffap.la: $(ffap_la_OBJECTS) $(ffap_la_DEPENDENCIES) $(EXTRA_ffap_la_DEPENDENCIES) 
-	$(ffap_la_LINK) $(am_ffap_la_rpath) $(ffap_la_OBJECTS) $(ffap_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(ffap_la_LINK) $(am_ffap_la_rpath) $(ffap_la_OBJECTS) $(ffap_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -468,25 +555,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ffap.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -494,26 +581,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -525,15 +601,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -542,6 +614,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -686,19 +773,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 @APE_USE_YASM_TRUE@@HAVE_FFAP_TRUE@@HAVE_YASM_TRUE at .asm.lo:
diff --git a/plugins/ffap/ffap.c b/plugins/ffap/ffap.c
index 1a7641f..5db910e 100644
--- a/plugins/ffap/ffap.c
+++ b/plugins/ffap/ffap.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
     based on apedec from FFMpeg Copyright (c) 2007 Benjamin Zores <ben at geexbox.org>
     based upon libdemac from Dave Chapman.
@@ -274,6 +274,7 @@ typedef struct APEContext {
 
     int error;
     int skip_header;
+    int filterbuf_size[APE_FILTER_LEVELS];
 } APEContext;
 
 typedef struct {
@@ -398,7 +399,7 @@ ape_read_header(DB_FILE *fp, APEContext *ape)
         return -1;
     }
 
-    if (ape->fileversion < APE_MIN_VERSION || ape->fileversion > APE_MAX_VERSION) {
+    if (ape->fileversion < APE_MIN_VERSION) {
         fprintf (stderr, "ape: Unsupported file version - %d.%02d\n", ape->fileversion / 1000, (ape->fileversion % 1000) / 10);
         return -1;
     }
@@ -435,7 +436,9 @@ ape_read_header(DB_FILE *fp, APEContext *ape)
         /* Skip any unknown bytes at the end of the descriptor.
            This is for future compatibility */
         if (ape->descriptorlength > 52) {
-            deadbeef->fseek (fp, ape->descriptorlength - 52, SEEK_CUR);
+            if (deadbeef->fseek (fp, ape->descriptorlength - 52, SEEK_CUR)) {
+                return -1;
+            }
         }
 
         /* Read header data */
@@ -493,7 +496,9 @@ ape_read_header(DB_FILE *fp, APEContext *ape)
         }
 
         if (ape->formatflags & MAC_FORMAT_FLAG_HAS_PEAK_LEVEL) {
-            deadbeef->fseek(fp, 4, SEEK_CUR); /* Skip the peak level */
+            if (deadbeef->fseek(fp, 4, SEEK_CUR)) { /* Skip the peak level */
+                return -1;
+            }
             ape->headerlength += 4;
         }
 
@@ -522,7 +527,9 @@ ape_read_header(DB_FILE *fp, APEContext *ape)
 
         /* Skip any stored wav header */
         if (!(ape->formatflags & MAC_FORMAT_FLAG_CREATE_WAV_HEADER)) {
-            deadbeef->fseek (fp, ape->wavheaderlength, SEEK_CUR);
+            if (deadbeef->fseek (fp, ape->wavheaderlength, SEEK_CUR)) {
+                return -1;
+            }
         }
     }
 
@@ -607,7 +614,7 @@ static int ape_read_packet(DB_FILE *fp, APEContext *ape_ctx)
 
     if (ape->currentframe > ape->totalframes)
         return -1;
-    trace ("seeking to packet %d (%d + %d)\n", ape->currentframe, ape->frames[ape->currentframe].pos, ape_ctx->skip_header);
+    trace ("seeking to packet %d (%lld + %d)\n", ape->currentframe, ape->frames[ape->currentframe].pos, ape_ctx->skip_header);
     if (deadbeef->fseek (fp, ape->frames[ape->currentframe].pos + ape_ctx->skip_header, SEEK_SET) != 0) {
         return -1;
     }
@@ -665,6 +672,7 @@ ape_free_ctx (APEContext *ape_ctx) {
             ape_ctx->filterbuf[i] = NULL;
         }
     }
+    memset (ape_ctx, 0, sizeof (APEContext));
 }
 
 static void
@@ -699,10 +707,14 @@ ffap_init (DB_fileinfo_t *_info, DB_playItem_t *it)
     memset (&info->ape_ctx, 0, sizeof (info->ape_ctx));
     int skip = deadbeef->junk_get_leading_size (info->fp);
     if (skip > 0) {
-        deadbeef->fseek (info->fp, skip, SEEK_SET);
+        if (deadbeef->fseek (info->fp, skip, SEEK_SET)) {
+            return -1;
+        }
         info->ape_ctx.skip_header = skip;
     }
-    ape_read_header (info->fp, &info->ape_ctx);
+    if (ape_read_header (info->fp, &info->ape_ctx)) {
+        return -1;
+    }
     int i;
 
     if (info->ape_ctx.channels > 2) {
@@ -721,7 +733,8 @@ ffap_init (DB_fileinfo_t *_info, DB_playItem_t *it)
     for (i = 0; i < APE_FILTER_LEVELS; i++) {
         if (!ape_filter_orders[info->ape_ctx.fset][i])
             break;
-        int err = posix_memalign ((void **)&info->ape_ctx.filterbuf[i], 16, (ape_filter_orders[info->ape_ctx.fset][i] * 3 + HISTORY_SIZE) * 4);
+        info->ape_ctx.filterbuf_size[i] = (ape_filter_orders[info->ape_ctx.fset][i] * 3 + HISTORY_SIZE) * 4;
+        int err = posix_memalign ((void **)&info->ape_ctx.filterbuf[i], 16, info->ape_ctx.filterbuf_size[i]);
         if (err) {
             trace ("ffap: out of memory (posix_memalign)\n");
             return -1;
@@ -734,6 +747,13 @@ ffap_init (DB_fileinfo_t *_info, DB_playItem_t *it)
     _info->fmt.channels = info->ape_ctx.channels;
     _info->fmt.channelmask = _info->fmt.channels == 1 ? DDB_SPEAKER_FRONT_LEFT : (DDB_SPEAKER_FRONT_LEFT | DDB_SPEAKER_FRONT_RIGHT);
     _info->readpos = 0;
+
+    info->ape_ctx.packet_data = malloc (PACKET_BUFFER_SIZE);
+    if (!info->ape_ctx.packet_data) {
+        fprintf (stderr, "ape: failed to allocate memory for packet data\n");
+        return -1;
+    }
+
     if (it->endsample > 0) {
         info->startsample = it->startsample;
         info->endsample = it->endsample;
@@ -745,11 +765,6 @@ ffap_init (DB_fileinfo_t *_info, DB_playItem_t *it)
         info->endsample = info->ape_ctx.totalsamples-1;
     }
 
-    info->ape_ctx.packet_data = malloc (PACKET_BUFFER_SIZE);
-    if (!info->ape_ctx.packet_data) {
-        fprintf (stderr, "ape: failed to allocate memory for packet data\n");
-        return -1;
-    }
     return 0;
 }
 
@@ -965,6 +980,7 @@ static inline int ape_decode_value(APEContext * ctx, APERice *rice)
             range_dec_normalize(ctx);
             ctx->rc.help = ctx->rc.range / ((pivot >> lo_bits) + 1);
             if (unlikely (ctx->rc.help == 0)) {
+                trace ("rc.help=0\n");
                 ctx->error = 1;
                 return 0;
             }
@@ -1475,7 +1491,7 @@ ape_decode_frame(DB_fileinfo_t *_info, void *data, int *data_size)
 
     /* should not happen but who knows */
     if (BLOCKS_PER_LOOP * samplesize > *data_size) {
-        fprintf (stderr, "ape: Packet size is too big! (max is %d where you have %d)\n", *data_size, BLOCKS_PER_LOOP * samplesize);
+        fprintf (stderr, "ape: Packet size is too big! (max is %d while you have %d)\n", *data_size, BLOCKS_PER_LOOP * samplesize);
         return -1;
     }
 
@@ -1485,7 +1501,7 @@ ape_decode_frame(DB_fileinfo_t *_info, void *data, int *data_size)
                 return -1;
             }
             assert (!s->samples);
-//            fprintf (stderr, "start reading packet %d\n", ape_ctx.currentframe);
+            trace ("start reading packet %d\n", s->currentframe);
             assert (s->samples == 0); // all samples from prev packet must have been read
             // start new packet
             if (ape_read_packet (info->fp, s) < 0) {
@@ -1494,15 +1510,14 @@ ape_decode_frame(DB_fileinfo_t *_info, void *data, int *data_size)
             }
             bswap_buf((uint32_t*)(s->packet_data), (const uint32_t*)(s->packet_data), s->packet_remaining >> 2);
 
-//            fprintf (stderr, "packet_sizeleft=%d packet_remaining=%d\n", packet_sizeleft, packet_remaining);
             s->ptr = s->last_ptr = s->packet_data;
 
             nblocks = s->samples = bytestream_get_be32(&s->ptr);
 
-            //fprintf (stderr, "s->samples=%d (1)\n", s->samples);
+            trace ("s->samples=%d (1)\n", s->samples);
             n = bytestream_get_be32(&s->ptr);
             if(n < 0 || n > 3){
-                fprintf (stderr, "ape: Incorrect offset passed\n");
+                trace ("ape: Incorrect offset passed\n");
                 return -1;
             }
             s->ptr += n;
@@ -1520,6 +1535,7 @@ ape_decode_frame(DB_fileinfo_t *_info, void *data, int *data_size)
             memset(s->decoded1,  0, sizeof(s->decoded1));
 
             /* Initialize the frame decoder */
+            trace ("init_frame_decoder\n");
             init_frame_decoder(s);
         }
         else {
@@ -1563,7 +1579,7 @@ ape_decode_frame(DB_fileinfo_t *_info, void *data, int *data_size)
             fprintf (stderr, "ape: Error decoding frame, error=%d\n", s->error);
         }
         else {
-            fprintf (stderr, "ape: Error decoding frame, ptr > data_end\n");
+            fprintf (stderr, "ape: Error decoding frame, ptr >= data_end\n");
         }
         return -1;
     }
@@ -1651,19 +1667,17 @@ ffap_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
 
     int skip = deadbeef->junk_get_leading_size (fp);
     if (skip > 0) {
-        deadbeef->fseek (fp, skip, SEEK_SET);
+        if (deadbeef->fseek (fp, skip, SEEK_SET)) {
+            goto error;
+        }
     }
     if (ape_read_header (fp, &ape_ctx) < 0) {
         fprintf (stderr, "ape: failed to read ape header\n");
-        deadbeef->fclose (fp);
-        ape_free_ctx (&ape_ctx);
-        return NULL;
+        goto error;
     }
-    if ((ape_ctx.fileversion < APE_MIN_VERSION) || (ape_ctx.fileversion > APE_MAX_VERSION)) {
+    if (ape_ctx.fileversion < APE_MIN_VERSION) {
         fprintf(stderr, "ape: unsupported file version - %.2f\n", ape_ctx.fileversion/1000.0);
-        deadbeef->fclose (fp);
-        ape_free_ctx (&ape_ctx);
-        return NULL;
+        goto error;
     }
 
     float duration = ape_ctx.totalsamples / (float)ape_ctx.samplerate;
@@ -1675,15 +1689,19 @@ ffap_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
     /*int v2err = */deadbeef->junk_id3v2_read (it, fp);
     int v1err = deadbeef->junk_id3v1_read (it, fp);
     if (v1err >= 0) {
-        deadbeef->fseek (fp, -128, SEEK_END);
+        if (deadbeef->fseek (fp, -128, SEEK_END)) {
+            goto error;
+        }
     }
     else {
-        deadbeef->fseek (fp, 0, SEEK_END);
+        if (deadbeef->fseek (fp, 0, SEEK_END)) {
+            goto error;
+        }
     }
     /*int apeerr = */deadbeef->junk_apev2_read (it, fp);
 
     deadbeef->fclose (fp);
-    ape_free_ctx (&ape_ctx);
+    fp = NULL;
 
     // embedded cue
     deadbeef->pl_lock ();
@@ -1695,6 +1713,7 @@ ffap_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
             deadbeef->pl_item_unref (it);
             deadbeef->pl_item_unref (cue);
             deadbeef->pl_unlock ();
+            ape_free_ctx (&ape_ctx);
             return cue;
         }
     }
@@ -1717,6 +1736,7 @@ ffap_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
     if (cue) {
         deadbeef->pl_item_unref (it);
         deadbeef->pl_item_unref (cue);
+        ape_free_ctx (&ape_ctx);
         return cue;
     }
 
@@ -1725,7 +1745,18 @@ ffap_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
     after = deadbeef->plt_insert_item (plt, after, it);
     deadbeef->pl_item_unref (it);
 
+    ape_free_ctx (&ape_ctx);
     return after;
+
+error:
+    if (fp) {
+        deadbeef->fclose (fp);
+    }
+    if (ape_ctx.packet_data) {
+        ape_free_ctx (&ape_ctx);
+    }
+    return NULL;
+
 }
 
 static int
@@ -1799,6 +1830,28 @@ ffap_seek_sample (DB_fileinfo_t *_info, int sample) {
     trace ("samples to skip: %d\n", info->ape_ctx.samplestoskip);
 
     // reset decoder
+    info->ape_ctx.CRC = 0;
+    info->ape_ctx.frameflags = 0;
+    info->ape_ctx.currentframeblocks = 0;
+    info->ape_ctx.blocksdecoded = 0;
+    memset (&info->ape_ctx.predictor, 0, sizeof (info->ape_ctx.predictor));
+    memset (info->ape_ctx.decoded0, 0, sizeof (info->ape_ctx.decoded0));
+    memset (info->ape_ctx.decoded1, 0, sizeof (info->ape_ctx.decoded1));
+    for (int i = 0; i < APE_FILTER_LEVELS; i++) {
+        memset (info->ape_ctx.filterbuf[i], 0, info->ape_ctx.filterbuf_size[i]);
+    }
+    memset (&info->ape_ctx.rc, 0, sizeof (info->ape_ctx.rc));
+    memset (&info->ape_ctx.riceX, 0, sizeof (info->ape_ctx.riceX));
+    memset (&info->ape_ctx.riceY, 0, sizeof (info->ape_ctx.riceY));
+    memset (info->ape_ctx.filters, 0, sizeof (info->ape_ctx.filters));
+    memset (info->ape_ctx.packet_data, 0, PACKET_BUFFER_SIZE);
+    info->ape_ctx.packet_sizeleft = 0;
+    info->ape_ctx.data_end = NULL;
+    info->ape_ctx.ptr = NULL;
+    info->ape_ctx.last_ptr = NULL;
+    info->ape_ctx.error = 0;
+    memset (info->ape_ctx.buffer, 0, sizeof (info->ape_ctx.buffer));
+
     info->ape_ctx.remaining = 0;
     info->ape_ctx.packet_remaining = 0;
     info->ape_ctx.samples = 0;
diff --git a/plugins/ffmpeg/COPYING b/plugins/ffmpeg/COPYING
new file mode 100644
index 0000000..c07664c
--- /dev/null
+++ b/plugins/ffmpeg/COPYING
@@ -0,0 +1,18 @@
+FFMPEG plugin for DeaDBeeF
+Copyright (C) 2009-2014 Alexey Yakovenko et al.
+Copyright (C) FFMPEG Developers
+
+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.
+
diff --git a/plugins/ffmpeg/Makefile.am b/plugins/ffmpeg/Makefile.am
index 0793990..4119199 100644
--- a/plugins/ffmpeg/Makefile.am
+++ b/plugins/ffmpeg/Makefile.am
@@ -2,7 +2,7 @@ if HAVE_FFMPEG
 ffmpegdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = ffmpeg.la
 ffmpeg_la_SOURCES = ffmpeg.c
-ffmpeg_la_LDFLAGS = -module
+ffmpeg_la_LDFLAGS = -module -avoid-version
 
 ffmpeg_la_LIBADD = $(LDADD) $(FFMPEG_DEPS_LIBS)
 AM_CFLAGS = $(CFLAGS) -std=c99 ${FFMPEG_DEPS_CFLAGS}
diff --git a/plugins/ffmpeg/Makefile.in b/plugins/ffmpeg/Makefile.in
index 6f4f0f8..25151ba 100644
--- a/plugins/ffmpeg/Makefile.in
+++ b/plugins/ffmpeg/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/ffmpeg
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -114,23 +142,48 @@ am__DEPENDENCIES_1 =
 am__ffmpeg_la_SOURCES_DIST = ffmpeg.c
 @HAVE_FFMPEG_TRUE at am_ffmpeg_la_OBJECTS = ffmpeg.lo
 ffmpeg_la_OBJECTS = $(am_ffmpeg_la_OBJECTS)
-ffmpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+ffmpeg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(ffmpeg_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_FFMPEG_TRUE at am_ffmpeg_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(ffmpeg_la_SOURCES)
 DIST_SOURCES = $(am__ffmpeg_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,6 +191,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,6 +234,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -184,10 +255,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -210,6 +283,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -263,6 +337,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -281,6 +356,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -306,13 +383,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -321,7 +402,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -382,7 +465,7 @@ top_srcdir = @top_srcdir@
 @HAVE_FFMPEG_TRUE at ffmpegdir = $(libdir)/$(PACKAGE)
 @HAVE_FFMPEG_TRUE at pkglib_LTLIBRARIES = ffmpeg.la
 @HAVE_FFMPEG_TRUE at ffmpeg_la_SOURCES = ffmpeg.c
- at HAVE_FFMPEG_TRUE@ffmpeg_la_LDFLAGS = -module
+ at HAVE_FFMPEG_TRUE@ffmpeg_la_LDFLAGS = -module -avoid-version
 @HAVE_FFMPEG_TRUE at ffmpeg_la_LIBADD = $(LDADD) $(FFMPEG_DEPS_LIBS)
 @HAVE_FFMPEG_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 ${FFMPEG_DEPS_CFLAGS}
 all: all-am
@@ -419,6 +502,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -445,14 +529,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 ffmpeg.la: $(ffmpeg_la_OBJECTS) $(ffmpeg_la_DEPENDENCIES) $(EXTRA_ffmpeg_la_DEPENDENCIES) 
-	$(ffmpeg_la_LINK) $(am_ffmpeg_la_rpath) $(ffmpeg_la_OBJECTS) $(ffmpeg_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(ffmpeg_la_LINK) $(am_ffmpeg_la_rpath) $(ffmpeg_la_OBJECTS) $(ffmpeg_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -463,25 +550,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ffmpeg.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,26 +576,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +596,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +609,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -681,19 +768,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
index bbd6c89..960d19c 100644
--- a/plugins/ffmpeg/ffmpeg.c
+++ b/plugins/ffmpeg/ffmpeg.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -304,6 +304,11 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) {
     trace ("ffmpeg_read_int16 %d\n", size);
     ffmpeg_info_t *info = (ffmpeg_info_t*)_info;
 
+    _info->fmt.channels = info->ctx->channels;
+    _info->fmt.samplerate = info->ctx->sample_rate;
+    _info->fmt.bps = av_get_bits_per_sample_format (info->ctx->sample_fmt);
+    _info->fmt.is_float = (info->ctx->sample_fmt == AV_SAMPLE_FMT_FLT || info->ctx->sample_fmt == AV_SAMPLE_FMT_FLTP);
+
     int samplesize = _info->fmt.channels * _info->fmt.bps / 8;
 
     if (info->endsample >= 0 && info->currentsample + size / samplesize > info->endsample) {
@@ -437,10 +442,9 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) {
             if (info->pkt.duration > 0) {
                 AVRational *time_base = &info->fctx->streams[info->stream_id]->time_base;
                 float sec = (float)info->pkt.duration * time_base->num / time_base->den;
-                int bitrate = info->pkt.size/sec;
+                int bitrate = info->pkt.size * 8 / sec;
                 if (bitrate > 0) {
-                    // FIXME: seems like duration translation is wrong
-                    deadbeef->streamer_set_bitrate (bitrate / 100);
+                    deadbeef->streamer_set_bitrate (bitrate / 1000);
                 }
             }
 
@@ -549,18 +553,40 @@ ffmpeg_read_metadata_internal (DB_playItem_t *it, AVFormatContext *fctx) {
     }
 #else
     // ffmpeg-0.11 new metadata format
-    AVDictionary *md = fctx->metadata;
     AVDictionaryEntry *t = NULL;
-    while (t = av_dict_get (md, "", t, AV_DICT_IGNORE_SUFFIX)) {
-        int m;
-        for (m = 0; map[m]; m += 2) {
-            if (!strcasecmp (t->key, map[m])) {
-                deadbeef->pl_append_meta (it, map[m+1], t->value);
-                break;
-            }
+    int m;
+    for (int i = 0; i < fctx->nb_streams + 1; i++) {
+        AVDictionary *md = i == 0 ? fctx->metadata : fctx->streams[i-1]->metadata;
+        if (!md) {
+            continue;
         }
-        if (!map[m]) {
-            deadbeef->pl_append_meta (it, t->key, t->value);
+        while (t = av_dict_get (md, "", t, AV_DICT_IGNORE_SUFFIX)) {
+            if (!strcasecmp (t->key, "replaygain_album_gain")) {
+                deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, atof (t->value));
+                continue;
+            }
+            else if (!strcasecmp (t->key, "replaygain_album_peak")) {
+                deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, atof (t->value));
+                continue;
+            }
+            else if (!strcasecmp (t->key, "replaygain_track_gain")) {
+                deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, atof (t->value));
+                continue;
+            }
+            else if (!strcasecmp (t->key, "replaygain_track_peak")) {
+                deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, atof (t->value));
+                continue;
+            }
+
+            for (m = 0; map[m]; m += 2) {
+                if (!strcasecmp (t->key, map[m])) {
+                    deadbeef->pl_append_meta (it, map[m+1], t->value);
+                    break;
+                }
+            }
+            if (!map[m]) {
+                deadbeef->pl_append_meta (it, t->key, t->value);
+            }
         }
     }
 #endif
@@ -636,7 +662,7 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
 #endif
         {
             codec = avcodec_find_decoder(ctx->codec_id);
-            if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams
+            if (codec != NULL) {
                 break;
             }
         }
diff --git a/plugins/flac/COPYING b/plugins/flac/COPYING
new file mode 100644
index 0000000..b8147af
--- /dev/null
+++ b/plugins/flac/COPYING
@@ -0,0 +1,93 @@
+FLAC plugin for DeaDBeeF
+Copyright (C) 2009-2014 Alexey Yakovenko et al.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the DeaDBeeF Player nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+libFLAC - Free Lossless Audio Codec library
+Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+libogg
+Copyright (c) 2002, Xiph.org Foundation
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/plugins/flac/Makefile.am b/plugins/flac/Makefile.am
index 1e8b09b..c8e8276 100644
--- a/plugins/flac/Makefile.am
+++ b/plugins/flac/Makefile.am
@@ -2,8 +2,13 @@ if HAVE_FLAC
 flacdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = flac.la
 flac_la_SOURCES = flac.c
-flac_la_LDFLAGS = -module
+flac_la_LDFLAGS = -module -avoid-version -export-symbols-regex flac_load
 
-flac_la_LIBADD = $(LDADD) $(FLAC_LIBS)
-AM_CFLAGS = $(CFLAGS) -std=c99
+if HAVE_OGG
+oggedit_def = -DUSE_OGGEDIT=1
+oggedit_lib = ../liboggedit/liboggedit.a $(OGG_LIBS)
+endif
+
+flac_la_LIBADD = $(LDADD) $(FLAC_LIBS) $(oggedit_lib)
+AM_CFLAGS = $(CFLAGS) $(FLAC_CFLAGS) $(oggedit_def) -std=c99
 endif
diff --git a/plugins/flac/Makefile.in b/plugins/flac/Makefile.in
index 91f7d4c..5ee7ec4 100644
--- a/plugins/flac/Makefile.in
+++ b/plugins/flac/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/flac
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -110,27 +138,56 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(pkglibdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
- at HAVE_FLAC_TRUE@flac_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ at HAVE_FLAC_TRUE@@HAVE_OGG_TRUE at am__DEPENDENCIES_2 =  \
+ at HAVE_FLAC_TRUE@@HAVE_OGG_TRUE@	../liboggedit/liboggedit.a \
+ at HAVE_FLAC_TRUE@@HAVE_OGG_TRUE@	$(am__DEPENDENCIES_1)
+ at HAVE_FLAC_TRUE@flac_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ at HAVE_FLAC_TRUE@	$(am__DEPENDENCIES_2)
 am__flac_la_SOURCES_DIST = flac.c
 @HAVE_FLAC_TRUE at am_flac_la_OBJECTS = flac.lo
 flac_la_OBJECTS = $(am_flac_la_OBJECTS)
-flac_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(flac_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+flac_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(flac_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_FLAC_TRUE at am_flac_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(flac_la_SOURCES)
 DIST_SOURCES = $(am__flac_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,6 +195,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,6 +238,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -184,10 +259,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -210,6 +287,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -263,6 +341,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -281,6 +360,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -306,13 +387,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -321,7 +406,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -382,9 +469,11 @@ top_srcdir = @top_srcdir@
 @HAVE_FLAC_TRUE at flacdir = $(libdir)/$(PACKAGE)
 @HAVE_FLAC_TRUE at pkglib_LTLIBRARIES = flac.la
 @HAVE_FLAC_TRUE at flac_la_SOURCES = flac.c
- at HAVE_FLAC_TRUE@flac_la_LDFLAGS = -module
- at HAVE_FLAC_TRUE@flac_la_LIBADD = $(LDADD) $(FLAC_LIBS)
- at HAVE_FLAC_TRUE@AM_CFLAGS = $(CFLAGS) -std=c99
+ at HAVE_FLAC_TRUE@flac_la_LDFLAGS = -module -avoid-version -export-symbols-regex flac_load
+ at HAVE_FLAC_TRUE@@HAVE_OGG_TRUE at oggedit_def = -DUSE_OGGEDIT=1
+ at HAVE_FLAC_TRUE@@HAVE_OGG_TRUE at oggedit_lib = ../liboggedit/liboggedit.a $(OGG_LIBS)
+ at HAVE_FLAC_TRUE@flac_la_LIBADD = $(LDADD) $(FLAC_LIBS) $(oggedit_lib)
+ at HAVE_FLAC_TRUE@AM_CFLAGS = $(CFLAGS) $(FLAC_CFLAGS) $(oggedit_def) -std=c99
 all: all-am
 
 .SUFFIXES:
@@ -419,6 +508,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -445,14 +535,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 flac.la: $(flac_la_OBJECTS) $(flac_la_DEPENDENCIES) $(EXTRA_flac_la_DEPENDENCIES) 
-	$(flac_la_LINK) $(am_flac_la_rpath) $(flac_la_OBJECTS) $(flac_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(flac_la_LINK) $(am_flac_la_rpath) $(flac_la_OBJECTS) $(flac_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -463,25 +556,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/flac.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,26 +582,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +602,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +615,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -681,19 +774,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/flac/flac.c b/plugins/flac/flac.c
index 4282220..e30cf84 100644
--- a/plugins/flac/flac.c
+++ b/plugins/flac/flac.c
@@ -1,28 +1,51 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+    - Neither the name of the DeaDBeeF Player nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
+#include <math.h>
 #include <FLAC/stream_decoder.h>
 #include <FLAC/metadata.h>
-#include <math.h>
+#if HAVE_SYS_SYSLIMITS_H
+#include <sys/syslimits.h>
+#endif
 #include "../../deadbeef.h"
 #include "../artwork/artwork.h"
+#include "../liboggedit/oggedit.h"
 
 static DB_decoder_t plugin;
 static DB_functions_t *deadbeef;
@@ -48,7 +71,6 @@ typedef struct {
     int64_t totalsamples;
     int flac_critical_error;
     int init_stop_decoding;
-    int tagsize;
     DB_FILE *file;
 
     // used only on insert
@@ -59,6 +81,8 @@ typedef struct {
     const char *fname;
     int bitrate;
     FLAC__StreamMetadata *flac_cue_sheet;
+
+    int got_vorbis_comments;
 } flac_info_t;
 
 // callbacks
@@ -69,23 +93,23 @@ FLAC__StreamDecoderReadStatus flac_read_cb (const FLAC__StreamDecoder *decoder,
     if (r == 0) {
         return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
     }
-    return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+    return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
 }
 
 FLAC__StreamDecoderSeekStatus flac_seek_cb (const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) {
     flac_info_t *info = (flac_info_t *)client_data;
     int r = deadbeef->fseek (info->file, absolute_byte_offset, SEEK_SET);
     if (r) {
-        return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
+        return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
     }
-    return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+    return FLAC__STREAM_DECODER_SEEK_STATUS_OK;
 }
 
 FLAC__StreamDecoderTellStatus flac_tell_cb (const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) {
     flac_info_t *info = (flac_info_t *)client_data;
     size_t r = deadbeef->ftell (info->file);
     *absolute_byte_offset = r;
-    return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+    return FLAC__STREAM_DECODER_TELL_STATUS_OK;
 }
 
 FLAC__StreamDecoderLengthStatus flac_lenght_cb (const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) {
@@ -94,7 +118,7 @@ FLAC__StreamDecoderLengthStatus flac_lenght_cb (const FLAC__StreamDecoder *decod
     deadbeef->fseek (info->file, 0, SEEK_END);
     *stream_length = deadbeef->ftell (info->file);
     deadbeef->fseek (info->file, pos, SEEK_SET);
-    return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+    return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
 }
 
 FLAC__bool flac_eof_cb (const FLAC__StreamDecoder *decoder, void *client_data) {
@@ -108,9 +132,6 @@ cflac_write_callback (const FLAC__StreamDecoder *decoder, const FLAC__Frame *fra
     if (frame->header.blocksize == 0) {
         return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
     }
-    if (info->bitrate > 0) {
-        deadbeef->streamer_set_bitrate (info->bitrate);
-    }
     int samplesize = _info->fmt.channels * _info->fmt.bps / 8;
     int bufsize = BUFFERSIZE - info->remaining;
     int bufsamples = bufsize / samplesize;
@@ -291,26 +312,8 @@ cflac_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
         fprintf (stderr, "corrupted/invalid flac stream\n");
         return -1;
     }
+    info->bitrate = deadbeef->pl_find_meta_int(it, ":BITRATE", -1);
 
-    // bitrate
-    size_t fsize = deadbeef->fgetlength (info->file);
-    FLAC__uint64 position;
-    FLAC__bool res = FLAC__stream_decoder_get_decode_position (info->decoder, &position);
-    if (res) {
-        fsize -= position;
-    }
-    int64_t totalsamples = FLAC__stream_decoder_get_total_samples (info->decoder);
-    if (totalsamples <= 0) {
-        trace ("flac: totalsamples=%lld\n", totalsamples);
-//        return -1;
-    }
-    float sec = totalsamples / (float)_info->fmt.samplerate;
-    if (sec > 0) {
-        info->bitrate = fsize / sec * 8 / 1000;
-    }
-    else {
-        info->bitrate = -1;
-    }
     deadbeef->pl_lock ();
     {
         const char *channelmask = deadbeef->pl_find_meta (it, "WAVEFORMAT_EXTENSIBLE_CHANNELMASK");
@@ -372,6 +375,9 @@ cflac_free (DB_fileinfo_t *_info) {
 static int
 cflac_read (DB_fileinfo_t *_info, char *bytes, int size) {
     flac_info_t *info = (flac_info_t *)_info;
+    if (info->bitrate != deadbeef->streamer_get_apx_bitrate()) {
+        deadbeef->streamer_set_bitrate (info->bitrate);
+    }
     int samplesize = _info->fmt.channels * _info->fmt.bps / 8;
     if (info->endsample >= 0) {
         if (size / samplesize + info->currentsample > info->endsample) {
@@ -529,7 +535,7 @@ static const char *metainfo[] = {
 };
 
 static void
-cflac_add_metadata (DB_playItem_t *it, char *s, int length) {
+cflac_add_metadata (DB_playItem_t *it, const char *s, int length) {
     int m;
     for (m = 0; metainfo[m]; m += 2) {
         int l = strlen (metainfo[m]);
@@ -569,7 +575,6 @@ cflac_add_metadata (DB_playItem_t *it, char *s, int length) {
 static void
 cflac_init_metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) {
     flac_info_t *info = (flac_info_t *)client_data;
-    info->tagsize += metadata->length;
     DB_fileinfo_t *_info = &info->info;
     if (info->init_stop_decoding) {
         trace ("error flag is set, ignoring init_metadata callback..\n");
@@ -595,7 +600,7 @@ cflac_init_metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__Str
         for (int i = 0; i < vc->num_comments; i++) {
             const FLAC__StreamMetadata_VorbisComment_Entry *c = &vc->comments[i];
             if (c->length > 0) {
-                char *s = c->entry;
+                const char *s = (const char *)c->entry;
                 cflac_add_metadata (it, s, c->length);
             }
         }
@@ -606,6 +611,7 @@ cflac_init_metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__Str
             f |= DDB_TAG_VORBISCOMMENTS;
             deadbeef->pl_set_item_flags (it, f);
         }
+        info->got_vorbis_comments = 1;
     }
     else if (metadata->type == FLAC__METADATA_TYPE_CUESHEET) {
         if (!info->flac_cue_sheet) {
@@ -617,6 +623,15 @@ cflac_init_metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__Str
 static DB_playItem_t *
 cflac_insert_with_embedded_cue (ddb_playlist_t *plt, DB_playItem_t *after, DB_playItem_t *origin, const FLAC__StreamMetadata_CueSheet *cuesheet, int totalsamples, int samplerate) {
     DB_playItem_t *ins = after;
+
+    // first check if cuesheet is matching the data
+    for (int i = 0; i < cuesheet->num_tracks; i++) {
+        if (cuesheet->tracks[i].offset >= totalsamples) {
+            fprintf (stderr, "The flac %s has invalid FLAC__METADATA_TYPE_CUESHEET block, which will get ignored. You should remove it using metaflac.\n", deadbeef->pl_find_meta_raw (origin, ":URI"));
+            return NULL;
+        }
+    }
+
     for (int i = 0; i < cuesheet->num_tracks-1; i++) {
         const char *uri = deadbeef->pl_find_meta_raw (origin, ":URI");
         const char *dec = deadbeef->pl_find_meta_raw (origin, ":DECODER");
@@ -639,9 +654,9 @@ cflac_insert_with_embedded_cue (ddb_playlist_t *plt, DB_playItem_t *after, DB_pl
         deadbeef->pl_item_unref (it);
     }
     deadbeef->pl_item_ref (after);
-    
+
     DB_playItem_t *first = deadbeef->pl_get_next (ins, PL_MAIN);
-    
+
     if (!first) {
         first = deadbeef->plt_get_first (plt, PL_MAIN);
     }
@@ -679,6 +694,8 @@ cflac_free_temp (DB_fileinfo_t *_info) {
     }
 }
 
+static int
+cflac_read_metadata (DB_playItem_t *it);
 
 static DB_playItem_t *
 cflac_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
@@ -770,17 +787,16 @@ cflac_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
         trace ("flac: FLAC__stream_decoder_process_until_end_of_metadata [2] failed\n");
         goto cflac_insert_fail;
     }
-    FLAC__stream_decoder_delete(decoder);
-    decoder = NULL;
 
     if (info.info.fmt.samplerate <= 0) {
         goto cflac_insert_fail;
     }
+    int64_t fsize = deadbeef->fgetlength (info.file);
+    int is_streaming = info.file->vfs->is_streaming ();
 
     deadbeef->pl_add_meta (it, ":FILETYPE", isogg ? "OggFLAC" : "FLAC");
 
     char s[100];
-    int64_t fsize = deadbeef->fgetlength (info.file);
     snprintf (s, sizeof (s), "%lld", fsize);
     deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
     snprintf (s, sizeof (s), "%d", info.info.fmt.channels);
@@ -790,8 +806,28 @@ cflac_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
     snprintf (s, sizeof (s), "%d", info.info.fmt.samplerate);
     deadbeef->pl_add_meta (it, ":SAMPLERATE", s);
     if ( deadbeef->pl_get_item_duration (it) > 0) {
-        snprintf (s, sizeof (s), "%d", (int)roundf((fsize-info.tagsize) / deadbeef->pl_get_item_duration (it) * 8 / 1000));
-        deadbeef->pl_add_meta (it, ":BITRATE", s);
+        if (!isogg) {
+            FLAC__uint64 position;
+            if (FLAC__stream_decoder_get_decode_position (decoder, &position))
+                fsize -= position;
+        }
+#if USE_OGGEDIT
+        else {
+            const off_t stream_size = oggedit_flac_stream_info(deadbeef->fopen(fname), 0, 0);
+            if (stream_size > 0)
+                fsize = stream_size;
+        }
+#endif
+        deadbeef->pl_set_meta_int (it, ":BITRATE", (int)roundf(fsize / deadbeef->pl_get_item_duration (it) * 8 / 1000));
+    }
+    FLAC__stream_decoder_delete(decoder);
+    decoder = NULL;
+
+    deadbeef->fclose (info.file);
+    info.file = NULL;
+
+    if (!info.got_vorbis_comments && !is_streaming) {
+        cflac_read_metadata (it);
     }
 
     // try embedded cue
@@ -806,17 +842,15 @@ cflac_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
             return cue;
         }
     }
-    else {
-        const char *cuesheet = deadbeef->pl_find_meta (it, "cuesheet");
-        if (cuesheet) {
-            DB_playItem_t *last = deadbeef->plt_insert_cue_from_buffer (plt, after, it, cuesheet, strlen (cuesheet), info.totalsamples, info.info.fmt.samplerate);
-            if (last) {
-                cflac_free_temp (_info);
-                deadbeef->pl_item_unref (it);
-                deadbeef->pl_item_unref (last);
-                deadbeef->pl_unlock ();
-                return last;
-            }
+    const char *cuesheet = deadbeef->pl_find_meta (it, "cuesheet");
+    if (cuesheet) {
+        DB_playItem_t *last = deadbeef->plt_insert_cue_from_buffer (plt, after, it, (const uint8_t *)cuesheet, strlen (cuesheet), info.totalsamples, info.info.fmt.samplerate);
+        if (last) {
+            cflac_free_temp (_info);
+            deadbeef->pl_item_unref (it);
+            deadbeef->pl_item_unref (last);
+            deadbeef->pl_unlock ();
+            return last;
         }
     }
     deadbeef->pl_unlock ();
@@ -842,7 +876,43 @@ cflac_insert_fail:
     return NULL;
 }
 
-int
+static size_t
+flac_io_read (void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle) {
+    return deadbeef->fread (ptr, size, nmemb, (DB_FILE *)handle);
+}
+
+static int
+flac_io_seek (FLAC__IOHandle handle, FLAC__int64 offset, int whence) {
+    return deadbeef->fseek ((DB_FILE *)handle, offset, whence);
+}
+
+static FLAC__int64
+flac_io_tell (FLAC__IOHandle handle) {
+    return deadbeef->ftell ((DB_FILE *)handle);
+}
+
+static int
+flac_io_eof (FLAC__IOHandle handle) {
+    int64_t pos = deadbeef->ftell ((DB_FILE *)handle);
+    return pos == deadbeef->fgetlength ((DB_FILE *)handle);
+}
+
+static int
+flac_io_close (FLAC__IOHandle handle) {
+    deadbeef->fclose ((DB_FILE *)handle);
+    return 0;
+}
+
+static FLAC__IOCallbacks iocb = {
+    .read = flac_io_read,
+    .write = NULL,
+    .seek = flac_io_seek,
+    .tell = flac_io_tell,
+    .eof = flac_io_eof,
+    .close = flac_io_close,
+};
+
+static int
 cflac_read_metadata (DB_playItem_t *it) {
     int err = -1;
     FLAC__Metadata_Chain *chain = NULL;
@@ -854,10 +924,19 @@ cflac_read_metadata (DB_playItem_t *it) {
         return -1;
     }
     deadbeef->pl_lock ();
-    FLAC__bool res = FLAC__metadata_chain_read (chain, deadbeef->pl_find_meta (it, ":URI"));
+    DB_FILE *file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    if (!file) {
+        return -1;
+    }
+    FLAC__bool res = FLAC__metadata_chain_read_with_callbacks (chain, (FLAC__IOHandle)file, iocb);
+    if (!res && FLAC__metadata_chain_status(chain) == FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_A_FLAC_FILE) {
+        res = FLAC__metadata_chain_read_ogg_with_callbacks (chain, (FLAC__IOHandle)file, iocb);
+    }
+    deadbeef->fclose (file);
+    file = NULL;
     if (!res) {
-        trace ("cflac_read_metadata: FLAC__metadata_chain_read failed\n");
+        trace ("cflac_read_metadata: FLAC__metadata_chain_read(_ogg) failed\n");
         goto error;
     }
     FLAC__metadata_chain_merge_padding (chain);
@@ -876,7 +955,7 @@ cflac_read_metadata (DB_playItem_t *it) {
             for (int i = 0; i < vc->num_comments; i++) {
                 const FLAC__StreamMetadata_VorbisComment_Entry *c = &vc->comments[i];
                 if (c->length > 0) {
-                    char *s = c->entry;
+                    const char *s = (const char *)c->entry;
                     cflac_add_metadata (it, s, c->length);
                 }
             }
@@ -908,7 +987,28 @@ error:
 
     return err;
 }
+#if USE_OGGEDIT
+int
+cflac_write_metadata_ogg (DB_playItem_t *it, FLAC__StreamMetadata_VorbisComment *vc)
+{
+    char fname[PATH_MAX];
+    deadbeef->pl_get_meta (it, ":URI", fname, sizeof (fname));
+
+    size_t num_tags = vc->num_comments;
+    char **tags = calloc(num_tags+1, sizeof(char **));
+    for (size_t i = 0; i < num_tags; i++)
+        tags[i] = (char *)vc->comments[i].entry;
+    const off_t file_size = oggedit_write_flac_metadata (deadbeef->fopen(fname), fname, 0, num_tags, tags);
+    if (file_size <= 0) {
+        trace ("cflac_write_metadata_ogg: oggedit_write_flac_metadata failed: code %d\n", file_size);
+        return -1;
+    }
+
+    free(tags);
 
+    return 0;
+}
+#endif
 int
 cflac_write_metadata (DB_playItem_t *it) {
     int err = -1;
@@ -917,14 +1017,21 @@ cflac_write_metadata (DB_playItem_t *it) {
 
     chain = FLAC__metadata_chain_new ();
     if (!chain) {
-        trace ("cflac_write_metadata: FLAC__metadata_chain_new failed\n");
+        fprintf (stderr, "cflac_write_metadata: FLAC__metadata_chain_new failed\n");
         return -1;
     }
     deadbeef->pl_lock ();
     FLAC__bool res = FLAC__metadata_chain_read (chain, deadbeef->pl_find_meta (it, ":URI"));
+    FLAC__bool isogg = false;
+#if USE_OGGEDIT
+    if (!res && FLAC__metadata_chain_status(chain) == FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_A_FLAC_FILE) {
+        isogg = true;
+        res = FLAC__metadata_chain_read_ogg (chain, deadbeef->pl_find_meta (it, ":URI"));
+    }
+#endif
     deadbeef->pl_unlock ();
     if (!res) {
-        trace ("cflac_write_metadata: FLAC__metadata_chain_read failed\n");
+        fprintf (stderr, "cflac_write_metadata: FLAC__metadata_chain_read(_ogg) failed - code %d\n", res);
         goto error;
     }
     FLAC__metadata_chain_merge_padding (chain);
@@ -943,15 +1050,31 @@ cflac_write_metadata (DB_playItem_t *it) {
         if (data && data->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
             break;
         }
+        else {
+            data = NULL;
+        }
     } while (FLAC__metadata_iterator_next (iter));
 
     if (data) {
-        // delete all comments
-        FLAC__metadata_object_vorbiscomment_resize_comments (data, 0);
+        FLAC__StreamMetadata_VorbisComment *vc = &data->data.vorbis_comment;
+        int vc_comments = vc->num_comments;
+        for (int i = 0; i < vc_comments; i++) {
+            const FLAC__StreamMetadata_VorbisComment_Entry *c = &vc->comments[i];
+            if (c->length > 0) {
+                if (strncasecmp ((const char *)c->entry, "replaygain_album_gain=", 22)
+                && strncasecmp ((const char *)c->entry, "replaygain_album_peak=", 22)
+                && strncasecmp ((const char *)c->entry, "replaygain_track_gain=", 22)
+                && strncasecmp ((const char *)c->entry, "replaygain_track_peak=", 22)) {
+                    FLAC__metadata_object_vorbiscomment_delete_comment (data, i);
+                    vc_comments--;
+                    i--;
+                }
+            }
+        }
     }
     else {
         // create new and add to chain
-		data = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT);
+        data = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT);
         if (!data) {
             fprintf (stderr, "flac: failed to allocate new vorbis comment block\n");
             goto error;
@@ -962,6 +1085,7 @@ cflac_write_metadata (DB_playItem_t *it) {
         }
     }
 
+    deadbeef->pl_lock ();
     DB_metaInfo_t *m = deadbeef->pl_get_metadata_head (it);
     while (m) {
         if (m->key[0] != ':') {
@@ -1001,107 +1125,23 @@ cflac_write_metadata (DB_playItem_t *it) {
         m = m->next;
     }
 
-#if 0 // fetching covers is broken, disabling for 0.5.2
-    // check if we have embedded cover
-    data = NULL;
-    while (FLAC__metadata_iterator_prev (iter));
-    do {
-        data = FLAC__metadata_iterator_get_block (iter);
-        if (data && data->type == FLAC__METADATA_TYPE_PICTURE) {
-            break;
-        }
-    } while (FLAC__metadata_iterator_next (iter));
+    deadbeef->pl_unlock ();
 
-    if (!coverart_plugin) {
-        DB_plugin_t **plugins = deadbeef->plug_get_list ();
-        for (int i = 0; plugins[i]; i++) {
-            DB_plugin_t *p = plugins[i];
-            if (p->id && !strcmp (p->id, "artwork") && p->version_major == 1 && p->version_minor >= 1) {
-                coverart_plugin = (DB_artwork_plugin_t *)p;
-                break;
-            }
-        }
+    if (!isogg) {
+        res = FLAC__metadata_chain_write (chain, 1, 0);
     }
-
-    // add coverart if the file doesn't have it
-    // FIXME: should have an option to overwrite it
-    if ((!data || data->type != FLAC__METADATA_TYPE_PICTURE) && coverart_plugin) {
-        deadbeef->pl_lock ();
-        const char *alb = deadbeef->pl_find_meta (it, "album");
-        const char *art = deadbeef->pl_find_meta (it, "artist");
-        if (!alb || !*alb) {
-            alb = deadbeef->pl_find_meta (it, "title");
-        }
-        const char *fn = deadbeef->pl_find_meta (it, ":URI");
-
-        char *album = alb ? strdupa (alb) : NULL;
-        char *artist = art ? strdupa (art) : NULL;
-        char *fname = fn ? strdupa (fn) : NULL;
-        deadbeef->pl_unlock ();
-
-        char *image_fname = coverart_plugin->get_album_art_sync (fname, artist, album, -1);
-
-        if (image_fname && strcmp (image_fname, coverart_plugin->get_default_cover())) {
-            DB_FILE *fp = deadbeef->fopen (image_fname);
-            FLAC__byte *coverart_data = NULL;
-            FLAC__StreamMetadata *metadata = NULL;
-            if (!fp) {
-                fprintf (stderr, "flac: cannot open coverart %s\n", image_fname);
-                goto error2;
-            }
-
-            int64_t len = deadbeef->fgetlength (fp);
-            if (len < 4) {
-                fprintf (stderr, "flac: cover image file %s is too small\n", image_fname);
-                goto error2;
-            }
-            coverart_data = malloc (len);
-            if (!coverart_data) {
-                fprintf (stderr, "flac: cannot allocate memory\n");
-                goto error2;
-            }
-            if (!deadbeef->fread (coverart_data, len, 1, fp)) {
-                fprintf (stderr, "flac: cannot read from %s\n",image_fname);
-                goto error2;
-            }
-
-            metadata = FLAC__metadata_object_new (FLAC__METADATA_TYPE_PICTURE);
-            if (!metadata) {
-                fprintf (stderr, "flac: failed to allocate new picture block\n");
-                goto error2;
-            }
-
-            FLAC__metadata_object_picture_set_description (metadata, "Cover", true);
-            FLAC__metadata_object_picture_set_data (metadata, coverart_data,len, true);
-            metadata->data.picture.type = FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER;
-
-            if (*(uint32_t *)coverart_data == 0x474e5089) {  // png header
-                metadata->data.picture.mime_type = strdup ("image/png");
-            } else {
-                metadata->data.picture.mime_type = strdup ("image/jpeg");
-            }
-
-            while (FLAC__metadata_iterator_next (iter));
-            if (!FLAC__metadata_iterator_insert_block_after (iter, metadata)) {
-                fprintf (stderr, "flac: failed to append picture block to chain\n");
-                goto error2;
-            }
-
-error2:
-            if (fp) {
-                deadbeef->fclose (fp);
-            }
-            if (coverart_data) {
-                free (coverart_data);
-            }
+#if USE_OGGEDIT
+    else {
+        if (cflac_write_metadata_ogg(it, &data->data.vorbis_comment)) {
+            res = 0;
         }
     }
 #endif
-
-    if (!FLAC__metadata_chain_write (chain, 1, 0)) {
-        trace ("cflac_write_metadata: FLAC__metadata_chain_write failed\n");
+    if (!res) {
+        fprintf (stderr, "cflac_write_metadata: failed to write tags: code %d\n", res);
         goto error;
     }
+
     err = 0;
 error:
     FLAC__metadata_iterator_delete (iter);
@@ -1124,22 +1164,37 @@ static DB_decoder_t plugin = {
     .plugin.id = "stdflac",
     .plugin.name = "FLAC decoder",
     .plugin.descr = "FLAC decoder using libFLAC",
-    .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+    .plugin.copyright =
+        "Copyright (C) 2009-2013 Alexey Yakovenko et al.\n"
+        "Uses libFLAC (C) Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson\n"
+        "Uses libogg Copyright (c) 2002, Xiph.org Foundation\n"
+        "\n"
+        "Redistribution and use in source and binary forms, with or without\n"
+        "modification, are permitted provided that the following conditions\n"
+        "are met:\n"
+        "\n"
+        "- Redistributions of source code must retain the above copyright\n"
+        "notice, this list of conditions and the following disclaimer.\n"
         "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "- Redistributions in binary form must reproduce the above copyright\n"
+        "notice, this list of conditions and the following disclaimer in the\n"
+        "documentation and/or other materials provided with the distribution.\n"
         "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
+        "- Neither the name of the DeaDBeeF Player nor the names of its\n"
+        "contributors may be used to endorse or promote products derived from\n"
+        "this software without specific prior written permission.\n"
         "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n"
+        "``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n"
+        "LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n"
+        "A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR\n"
+        "CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,\n"
+        "EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,\n"
+        "PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR\n"
+        "PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n"
+        "LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\n"
+        "NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n"
+        "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .open = cflac_open,
diff --git a/plugins/gme/COPYING b/plugins/gme/COPYING
new file mode 100644
index 0000000..445d1b9
--- /dev/null
+++ b/plugins/gme/COPYING
@@ -0,0 +1,40 @@
+Game_Music_Emu plugin for DeaDBeeF
+Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+Game_Music_Emu (modified)
+Copyright (C) 2003-2009 Shay Green.
+DeaDBeeF-related modifications (C) Alexey Yakovenko.
+
+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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
diff --git a/plugins/gme/Makefile.am b/plugins/gme/Makefile.am
index 9c789c3..05996e3 100644
--- a/plugins/gme/Makefile.am
+++ b/plugins/gme/Makefile.am
@@ -1,9 +1,5 @@
 if HAVE_GME
 
-#gmeversion=Game_Music_Emu-0.5.2
-#gmeversion=game-music-emu-0.5.5
-#gmeversion=game-music-emu-svn
-#gmeversion=game-music-emu-0.6.0
 gmeversion=game-music-emu-0.6pre
 gmepath=@top_srcdir@/plugins/gme/$(gmeversion)
 
@@ -188,219 +184,9 @@ gme_la_SOURCES = cgme.c\
 	$(gmeversion)/gme/Z80_Cpu.h\
 	$(gmeversion)/gme/Z80_Cpu_run.h
 
-# 0.6.0 files
-#gme_la_SOURCES = cgme.c\
-#	$(gmeversion)/gme/Ay_Apu.cpp\
-#	$(gmeversion)/gme/Ay_Cpu.cpp\
-#	$(gmeversion)/gme/Ay_Emu.cpp\
-#	$(gmeversion)/gme/Blip_Buffer.cpp\
-#	$(gmeversion)/gme/Classic_Emu.cpp\
-#	$(gmeversion)/gme/Data_Reader.cpp\
-#	$(gmeversion)/gme/Dual_Resampler.cpp\
-#	$(gmeversion)/gme/Effects_Buffer.cpp\
-#	$(gmeversion)/gme/Fir_Resampler.cpp\
-#	$(gmeversion)/gme/Gb_Apu.cpp\
-#	$(gmeversion)/gme/Gb_Cpu.cpp\
-#	$(gmeversion)/gme/Gb_Oscs.cpp\
-#	$(gmeversion)/gme/Gbs_Emu.cpp\
-#	$(gmeversion)/gme/gme.cpp\
-#	$(gmeversion)/gme/Gme_File.cpp\
-#	$(gmeversion)/gme/Gym_Emu.cpp\
-#	$(gmeversion)/gme/Hes_Apu.cpp\
-#	$(gmeversion)/gme/Hes_Cpu.cpp\
-#	$(gmeversion)/gme/Hes_Emu.cpp\
-#	$(gmeversion)/gme/Kss_Cpu.cpp\
-#	$(gmeversion)/gme/Kss_Emu.cpp\
-#	$(gmeversion)/gme/Kss_Scc_Apu.cpp\
-#	$(gmeversion)/gme/M3u_Playlist.cpp\
-#	$(gmeversion)/gme/Multi_Buffer.cpp\
-#	$(gmeversion)/gme/Music_Emu.cpp\
-#	$(gmeversion)/gme/Nes_Apu.cpp\
-#	$(gmeversion)/gme/Nes_Cpu.cpp\
-#	$(gmeversion)/gme/Nes_Fme7_Apu.cpp\
-#	$(gmeversion)/gme/Nes_Namco_Apu.cpp\
-#	$(gmeversion)/gme/Nes_Oscs.cpp\
-#	$(gmeversion)/gme/Nes_Vrc6_Apu.cpp\
-#	$(gmeversion)/gme/Nsfe_Emu.cpp\
-#	$(gmeversion)/gme/Nsf_Emu.cpp\
-#	$(gmeversion)/gme/Sap_Apu.cpp\
-#	$(gmeversion)/gme/Sap_Cpu.cpp\
-#	$(gmeversion)/gme/Sap_Emu.cpp\
-#	$(gmeversion)/gme/Sms_Apu.cpp\
-#	$(gmeversion)/gme/Snes_Spc.cpp\
-#	$(gmeversion)/gme/Spc_Cpu.cpp\
-#	$(gmeversion)/gme/Spc_Dsp.cpp\
-#	$(gmeversion)/gme/Spc_Emu.cpp\
-#	$(gmeversion)/gme/Spc_Filter.cpp\
-#	$(gmeversion)/gme/Vgm_Emu.cpp\
-#	$(gmeversion)/gme/Vgm_Emu_Impl.cpp\
-#	$(gmeversion)/gme/Ym2413_Emu.cpp\
-#	$(gmeversion)/gme/Ym2612_Emu.cpp\
-#	$(gmeversion)/gme/Ay_Apu.h\
-#	$(gmeversion)/gme/Ay_Cpu.h\
-#	$(gmeversion)/gme/Ay_Emu.h\
-#	$(gmeversion)/gme/blargg_common.h\
-#	$(gmeversion)/gme/blargg_config.h\
-#	$(gmeversion)/gme/blargg_endian.h\
-#	$(gmeversion)/gme/blargg_source.h\
-#	$(gmeversion)/gme/Blip_Buffer.h\
-#	$(gmeversion)/gme/Classic_Emu.h\
-#	$(gmeversion)/gme/Data_Reader.h\
-#	$(gmeversion)/gme/Dual_Resampler.h\
-#	$(gmeversion)/gme/Effects_Buffer.h\
-#	$(gmeversion)/gme/Fir_Resampler.h\
-#	$(gmeversion)/gme/Gb_Apu.h\
-#	$(gmeversion)/gme/Gb_Cpu.h\
-#	$(gmeversion)/gme/gb_cpu_io.h\
-#	$(gmeversion)/gme/Gb_Oscs.h\
-#	$(gmeversion)/gme/Gbs_Emu.h\
-#	$(gmeversion)/gme/Gme_File.h\
-#	$(gmeversion)/gme/gme.h\
-#	$(gmeversion)/gme/gme_types.h\
-#	$(gmeversion)/gme/Gym_Emu.h\
-#	$(gmeversion)/gme/Hes_Apu.h\
-#	$(gmeversion)/gme/Hes_Cpu.h\
-#	$(gmeversion)/gme/hes_cpu_io.h\
-#	$(gmeversion)/gme/Hes_Emu.h\
-#	$(gmeversion)/gme/Kss_Cpu.h\
-#	$(gmeversion)/gme/Kss_Emu.h\
-#	$(gmeversion)/gme/Kss_Scc_Apu.h\
-#	$(gmeversion)/gme/M3u_Playlist.h\
-#	$(gmeversion)/gme/Multi_Buffer.h\
-#	$(gmeversion)/gme/Music_Emu.h\
-#	$(gmeversion)/gme/Nes_Apu.h\
-#	$(gmeversion)/gme/Nes_Cpu.h\
-#	$(gmeversion)/gme/nes_cpu_io.h\
-#	$(gmeversion)/gme/Nes_Fme7_Apu.h\
-#	$(gmeversion)/gme/Nes_Namco_Apu.h\
-#	$(gmeversion)/gme/Nes_Oscs.h\
-#	$(gmeversion)/gme/Nes_Vrc6_Apu.h\
-#	$(gmeversion)/gme/Nsfe_Emu.h\
-#	$(gmeversion)/gme/Nsf_Emu.h\
-#	$(gmeversion)/gme/Sap_Apu.h\
-#	$(gmeversion)/gme/Sap_Cpu.h\
-#	$(gmeversion)/gme/sap_cpu_io.h\
-#	$(gmeversion)/gme/Sap_Emu.h\
-#	$(gmeversion)/gme/Sms_Apu.h\
-#	$(gmeversion)/gme/Sms_Oscs.h\
-#	$(gmeversion)/gme/Snes_Spc.h\
-#	$(gmeversion)/gme/Spc_Cpu.h\
-#	$(gmeversion)/gme/Spc_Dsp.h\
-#	$(gmeversion)/gme/Spc_Emu.h\
-#	$(gmeversion)/gme/Spc_Filter.h\
-#	$(gmeversion)/gme/Vgm_Emu.h\
-#	$(gmeversion)/gme/Vgm_Emu_Impl.h\
-#	$(gmeversion)/gme/Ym2413_Emu.h\
-#	$(gmeversion)/gme/Ym2612_Emu.h
-
-# 0.5.2 and 0.5.5 files
-#gme_la_SOURCES = cgme.c\
-#	$(gmeversion)/gme/Ay_Apu.cpp\
-#	$(gmeversion)/gme/Gb_Apu.cpp\
-#	$(gmeversion)/gme/Hes_Emu.cpp\
-#	$(gmeversion)/gme/Nes_Fme7_Apu.cpp\
-#	$(gmeversion)/gme/Sms_Apu.cpp\
-#	$(gmeversion)/gme/Ay_Cpu.cpp\
-#	$(gmeversion)/gme/Gb_Cpu.cpp\
-#	$(gmeversion)/gme/Kss_Cpu.cpp\
-#	$(gmeversion)/gme/Nes_Namco_Apu.cpp\
-#	$(gmeversion)/gme/Snes_Spc.cpp\
-#	$(gmeversion)/gme/Ay_Emu.cpp\
-#	$(gmeversion)/gme/Gb_Oscs.cpp\
-#	$(gmeversion)/gme/Kss_Emu.cpp\
-#	$(gmeversion)/gme/Nes_Oscs.cpp\
-#	$(gmeversion)/gme/Spc_Cpu.cpp\
-#	$(gmeversion)/gme/Blip_Buffer.cpp\
-#	$(gmeversion)/gme/Gbs_Emu.cpp\
-#	$(gmeversion)/gme/Kss_Scc_Apu.cpp\
-#	$(gmeversion)/gme/Nes_Vrc6_Apu.cpp\
-#	$(gmeversion)/gme/Spc_Dsp.cpp\
-#	$(gmeversion)/gme/Classic_Emu.cpp\
-#	$(gmeversion)/gme/gme.cpp\
-#	$(gmeversion)/gme/M3u_Playlist.cpp\
-#	$(gmeversion)/gme/Nsfe_Emu.cpp\
-#	$(gmeversion)/gme/Spc_Emu.cpp\
-#	$(gmeversion)/gme/Data_Reader.cpp\
-#	$(gmeversion)/gme/Gme_File.cpp\
-#	$(gmeversion)/gme/Multi_Buffer.cpp\
-#	$(gmeversion)/gme/Nsf_Emu.cpp\
-#	$(gmeversion)/gme/Vgm_Emu.cpp\
-#	$(gmeversion)/gme/Dual_Resampler.cpp\
-#	$(gmeversion)/gme/Gym_Emu.cpp\
-#	$(gmeversion)/gme/Music_Emu.cpp\
-#	$(gmeversion)/gme/Sap_Apu.cpp\
-#	$(gmeversion)/gme/Vgm_Emu_Impl.cpp\
-#	$(gmeversion)/gme/Effects_Buffer.cpp\
-#	$(gmeversion)/gme/Hes_Apu.cpp\
-#	$(gmeversion)/gme/Nes_Apu.cpp\
-#	$(gmeversion)/gme/Sap_Cpu.cpp\
-#	$(gmeversion)/gme/Ym2413_Emu.cpp\
-#	$(gmeversion)/gme/Fir_Resampler.cpp\
-#	$(gmeversion)/gme/Hes_Cpu.cpp\
-#	$(gmeversion)/gme/Nes_Cpu.cpp\
-#	$(gmeversion)/gme/Sap_Emu.cpp\
-#	$(gmeversion)/gme/Ym2612_Emu.cpp\
-#	$(gmeversion)/gme/Ay_Apu.h\
-#	$(gmeversion)/gme/Ay_Cpu.h\
-#	$(gmeversion)/gme/Ay_Emu.h\
-#	$(gmeversion)/gme/blargg_common.h\
-#	$(gmeversion)/gme/blargg_config.h\
-#	$(gmeversion)/gme/blargg_endian.h\
-#	$(gmeversion)/gme/blargg_source.h\
-#	$(gmeversion)/gme/Blip_Buffer.h\
-#	$(gmeversion)/gme/Classic_Emu.h\
-#	$(gmeversion)/gme/Data_Reader.h\
-#	$(gmeversion)/gme/Dual_Resampler.h\
-#	$(gmeversion)/gme/Effects_Buffer.h\
-#	$(gmeversion)/gme/Fir_Resampler.h\
-#	$(gmeversion)/gme/Gb_Apu.h\
-#	$(gmeversion)/gme/Gb_Cpu.h\
-#	$(gmeversion)/gme/gb_cpu_io.h\
-#	$(gmeversion)/gme/Gb_Oscs.h\
-#	$(gmeversion)/gme/Gbs_Emu.h\
-#	$(gmeversion)/gme/Gme_File.h\
-#	$(gmeversion)/gme/gme.h\
-#	$(gmeversion)/gme/Gym_Emu.h\
-#	$(gmeversion)/gme/Hes_Apu.h\
-#	$(gmeversion)/gme/Hes_Cpu.h\
-#	$(gmeversion)/gme/hes_cpu_io.h\
-#	$(gmeversion)/gme/Hes_Emu.h\
-#	$(gmeversion)/gme/Kss_Cpu.h\
-#	$(gmeversion)/gme/Kss_Emu.h\
-#	$(gmeversion)/gme/Kss_Scc_Apu.h\
-#	$(gmeversion)/gme/M3u_Playlist.h\
-#	$(gmeversion)/gme/Multi_Buffer.h\
-#	$(gmeversion)/gme/Music_Emu.h\
-#	$(gmeversion)/gme/Nes_Apu.h\
-#	$(gmeversion)/gme/Nes_Cpu.h\
-#	$(gmeversion)/gme/nes_cpu_io.h\
-#	$(gmeversion)/gme/Nes_Fme7_Apu.h\
-#	$(gmeversion)/gme/Nes_Namco_Apu.h\
-#	$(gmeversion)/gme/Nes_Oscs.h\
-#	$(gmeversion)/gme/Nes_Vrc6_Apu.h\
-#	$(gmeversion)/gme/Nsfe_Emu.h\
-#	$(gmeversion)/gme/Nsf_Emu.h\
-#	$(gmeversion)/gme/Sap_Apu.h\
-#	$(gmeversion)/gme/Sap_Cpu.h\
-#	$(gmeversion)/gme/sap_cpu_io.h\
-#	$(gmeversion)/gme/Sap_Emu.h\
-#	$(gmeversion)/gme/Sms_Apu.h\
-#	$(gmeversion)/gme/Sms_Oscs.h\
-#	$(gmeversion)/gme/Snes_Spc.h\
-#	$(gmeversion)/gme/Spc_Cpu.h\
-#	$(gmeversion)/gme/Spc_Dsp.h\
-#	$(gmeversion)/gme/Spc_Emu.h\
-#	$(gmeversion)/gme/Vgm_Emu.h\
-#	$(gmeversion)/gme/Vgm_Emu_Impl.h\
-#	$(gmeversion)/gme/Ym2413_Emu.h\
-#	$(gmeversion)/gme/Ym2612_Emu.h\
-#	$(gmeversion)/gme/gme_types.h\
-#	$(gmeversion)/gme/Spc_Filter.cpp\
-#	$(gmeversion)/gme/Spc_Filter.h
-
-gme_la_LDFLAGS = -module $(NOCPPLIB)
+gme_la_LDFLAGS = -module -avoid-version $(NOCPPLIB)
 gme_la_LIBADD = $(ZLIB_LIBS)
 
 AM_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -I$(gmepath) -std=c99 -DGME_VERSION_055
-AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -nostdlib -fno-unwind-tables
+AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fno-unwind-tables
 endif
diff --git a/plugins/gme/Makefile.in b/plugins/gme/Makefile.in
index b1d5220..77d1622 100644
--- a/plugins/gme/Makefile.in
+++ b/plugins/gme/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/gme
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -245,32 +273,66 @@ am__gme_la_SOURCES_DIST = cgme.c $(gmeversion)/gme/Ay_Apu.cpp \
 @HAVE_GME_TRUE@	Data_Reader.lo s_deltat.lo s_logtbl.lo s_opl.lo \
 @HAVE_GME_TRUE@	s_opltbl.lo ym2413.lo
 gme_la_OBJECTS = $(am_gme_la_OBJECTS)
-gme_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(gme_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+gme_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(gme_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_GME_TRUE at am_gme_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_ at AM_V@)
+am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(gme_la_SOURCES)
 DIST_SOURCES = $(am__gme_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -278,6 +340,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -304,6 +383,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -324,10 +404,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -350,6 +432,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -403,6 +486,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -421,6 +505,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -446,13 +532,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -461,7 +551,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -519,11 +611,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-
-#gmeversion=Game_Music_Emu-0.5.2
-#gmeversion=game-music-emu-0.5.5
-#gmeversion=game-music-emu-svn
-#gmeversion=game-music-emu-0.6.0
 @HAVE_GME_TRUE at gmeversion = game-music-emu-0.6pre
 @HAVE_GME_TRUE at gmepath = @top_srcdir@/plugins/gme/$(gmeversion)
 @HAVE_GME_TRUE at EXTRA_DIST = $(gmepath)/changes.txt $(gmepath)/design.txt $(gmepath)/gme.txt $(gmepath)/license.txt $(gmepath)/readme.txt 
@@ -705,220 +792,10 @@ top_srcdir = @top_srcdir@
 @HAVE_GME_TRUE@	$(gmeversion)/gme/Z80_Cpu.h\
 @HAVE_GME_TRUE@	$(gmeversion)/gme/Z80_Cpu_run.h
 
-
-# 0.6.0 files
-#gme_la_SOURCES = cgme.c\
-#	$(gmeversion)/gme/Ay_Apu.cpp\
-#	$(gmeversion)/gme/Ay_Cpu.cpp\
-#	$(gmeversion)/gme/Ay_Emu.cpp\
-#	$(gmeversion)/gme/Blip_Buffer.cpp\
-#	$(gmeversion)/gme/Classic_Emu.cpp\
-#	$(gmeversion)/gme/Data_Reader.cpp\
-#	$(gmeversion)/gme/Dual_Resampler.cpp\
-#	$(gmeversion)/gme/Effects_Buffer.cpp\
-#	$(gmeversion)/gme/Fir_Resampler.cpp\
-#	$(gmeversion)/gme/Gb_Apu.cpp\
-#	$(gmeversion)/gme/Gb_Cpu.cpp\
-#	$(gmeversion)/gme/Gb_Oscs.cpp\
-#	$(gmeversion)/gme/Gbs_Emu.cpp\
-#	$(gmeversion)/gme/gme.cpp\
-#	$(gmeversion)/gme/Gme_File.cpp\
-#	$(gmeversion)/gme/Gym_Emu.cpp\
-#	$(gmeversion)/gme/Hes_Apu.cpp\
-#	$(gmeversion)/gme/Hes_Cpu.cpp\
-#	$(gmeversion)/gme/Hes_Emu.cpp\
-#	$(gmeversion)/gme/Kss_Cpu.cpp\
-#	$(gmeversion)/gme/Kss_Emu.cpp\
-#	$(gmeversion)/gme/Kss_Scc_Apu.cpp\
-#	$(gmeversion)/gme/M3u_Playlist.cpp\
-#	$(gmeversion)/gme/Multi_Buffer.cpp\
-#	$(gmeversion)/gme/Music_Emu.cpp\
-#	$(gmeversion)/gme/Nes_Apu.cpp\
-#	$(gmeversion)/gme/Nes_Cpu.cpp\
-#	$(gmeversion)/gme/Nes_Fme7_Apu.cpp\
-#	$(gmeversion)/gme/Nes_Namco_Apu.cpp\
-#	$(gmeversion)/gme/Nes_Oscs.cpp\
-#	$(gmeversion)/gme/Nes_Vrc6_Apu.cpp\
-#	$(gmeversion)/gme/Nsfe_Emu.cpp\
-#	$(gmeversion)/gme/Nsf_Emu.cpp\
-#	$(gmeversion)/gme/Sap_Apu.cpp\
-#	$(gmeversion)/gme/Sap_Cpu.cpp\
-#	$(gmeversion)/gme/Sap_Emu.cpp\
-#	$(gmeversion)/gme/Sms_Apu.cpp\
-#	$(gmeversion)/gme/Snes_Spc.cpp\
-#	$(gmeversion)/gme/Spc_Cpu.cpp\
-#	$(gmeversion)/gme/Spc_Dsp.cpp\
-#	$(gmeversion)/gme/Spc_Emu.cpp\
-#	$(gmeversion)/gme/Spc_Filter.cpp\
-#	$(gmeversion)/gme/Vgm_Emu.cpp\
-#	$(gmeversion)/gme/Vgm_Emu_Impl.cpp\
-#	$(gmeversion)/gme/Ym2413_Emu.cpp\
-#	$(gmeversion)/gme/Ym2612_Emu.cpp\
-#	$(gmeversion)/gme/Ay_Apu.h\
-#	$(gmeversion)/gme/Ay_Cpu.h\
-#	$(gmeversion)/gme/Ay_Emu.h\
-#	$(gmeversion)/gme/blargg_common.h\
-#	$(gmeversion)/gme/blargg_config.h\
-#	$(gmeversion)/gme/blargg_endian.h\
-#	$(gmeversion)/gme/blargg_source.h\
-#	$(gmeversion)/gme/Blip_Buffer.h\
-#	$(gmeversion)/gme/Classic_Emu.h\
-#	$(gmeversion)/gme/Data_Reader.h\
-#	$(gmeversion)/gme/Dual_Resampler.h\
-#	$(gmeversion)/gme/Effects_Buffer.h\
-#	$(gmeversion)/gme/Fir_Resampler.h\
-#	$(gmeversion)/gme/Gb_Apu.h\
-#	$(gmeversion)/gme/Gb_Cpu.h\
-#	$(gmeversion)/gme/gb_cpu_io.h\
-#	$(gmeversion)/gme/Gb_Oscs.h\
-#	$(gmeversion)/gme/Gbs_Emu.h\
-#	$(gmeversion)/gme/Gme_File.h\
-#	$(gmeversion)/gme/gme.h\
-#	$(gmeversion)/gme/gme_types.h\
-#	$(gmeversion)/gme/Gym_Emu.h\
-#	$(gmeversion)/gme/Hes_Apu.h\
-#	$(gmeversion)/gme/Hes_Cpu.h\
-#	$(gmeversion)/gme/hes_cpu_io.h\
-#	$(gmeversion)/gme/Hes_Emu.h\
-#	$(gmeversion)/gme/Kss_Cpu.h\
-#	$(gmeversion)/gme/Kss_Emu.h\
-#	$(gmeversion)/gme/Kss_Scc_Apu.h\
-#	$(gmeversion)/gme/M3u_Playlist.h\
-#	$(gmeversion)/gme/Multi_Buffer.h\
-#	$(gmeversion)/gme/Music_Emu.h\
-#	$(gmeversion)/gme/Nes_Apu.h\
-#	$(gmeversion)/gme/Nes_Cpu.h\
-#	$(gmeversion)/gme/nes_cpu_io.h\
-#	$(gmeversion)/gme/Nes_Fme7_Apu.h\
-#	$(gmeversion)/gme/Nes_Namco_Apu.h\
-#	$(gmeversion)/gme/Nes_Oscs.h\
-#	$(gmeversion)/gme/Nes_Vrc6_Apu.h\
-#	$(gmeversion)/gme/Nsfe_Emu.h\
-#	$(gmeversion)/gme/Nsf_Emu.h\
-#	$(gmeversion)/gme/Sap_Apu.h\
-#	$(gmeversion)/gme/Sap_Cpu.h\
-#	$(gmeversion)/gme/sap_cpu_io.h\
-#	$(gmeversion)/gme/Sap_Emu.h\
-#	$(gmeversion)/gme/Sms_Apu.h\
-#	$(gmeversion)/gme/Sms_Oscs.h\
-#	$(gmeversion)/gme/Snes_Spc.h\
-#	$(gmeversion)/gme/Spc_Cpu.h\
-#	$(gmeversion)/gme/Spc_Dsp.h\
-#	$(gmeversion)/gme/Spc_Emu.h\
-#	$(gmeversion)/gme/Spc_Filter.h\
-#	$(gmeversion)/gme/Vgm_Emu.h\
-#	$(gmeversion)/gme/Vgm_Emu_Impl.h\
-#	$(gmeversion)/gme/Ym2413_Emu.h\
-#	$(gmeversion)/gme/Ym2612_Emu.h
-
-# 0.5.2 and 0.5.5 files
-#gme_la_SOURCES = cgme.c\
-#	$(gmeversion)/gme/Ay_Apu.cpp\
-#	$(gmeversion)/gme/Gb_Apu.cpp\
-#	$(gmeversion)/gme/Hes_Emu.cpp\
-#	$(gmeversion)/gme/Nes_Fme7_Apu.cpp\
-#	$(gmeversion)/gme/Sms_Apu.cpp\
-#	$(gmeversion)/gme/Ay_Cpu.cpp\
-#	$(gmeversion)/gme/Gb_Cpu.cpp\
-#	$(gmeversion)/gme/Kss_Cpu.cpp\
-#	$(gmeversion)/gme/Nes_Namco_Apu.cpp\
-#	$(gmeversion)/gme/Snes_Spc.cpp\
-#	$(gmeversion)/gme/Ay_Emu.cpp\
-#	$(gmeversion)/gme/Gb_Oscs.cpp\
-#	$(gmeversion)/gme/Kss_Emu.cpp\
-#	$(gmeversion)/gme/Nes_Oscs.cpp\
-#	$(gmeversion)/gme/Spc_Cpu.cpp\
-#	$(gmeversion)/gme/Blip_Buffer.cpp\
-#	$(gmeversion)/gme/Gbs_Emu.cpp\
-#	$(gmeversion)/gme/Kss_Scc_Apu.cpp\
-#	$(gmeversion)/gme/Nes_Vrc6_Apu.cpp\
-#	$(gmeversion)/gme/Spc_Dsp.cpp\
-#	$(gmeversion)/gme/Classic_Emu.cpp\
-#	$(gmeversion)/gme/gme.cpp\
-#	$(gmeversion)/gme/M3u_Playlist.cpp\
-#	$(gmeversion)/gme/Nsfe_Emu.cpp\
-#	$(gmeversion)/gme/Spc_Emu.cpp\
-#	$(gmeversion)/gme/Data_Reader.cpp\
-#	$(gmeversion)/gme/Gme_File.cpp\
-#	$(gmeversion)/gme/Multi_Buffer.cpp\
-#	$(gmeversion)/gme/Nsf_Emu.cpp\
-#	$(gmeversion)/gme/Vgm_Emu.cpp\
-#	$(gmeversion)/gme/Dual_Resampler.cpp\
-#	$(gmeversion)/gme/Gym_Emu.cpp\
-#	$(gmeversion)/gme/Music_Emu.cpp\
-#	$(gmeversion)/gme/Sap_Apu.cpp\
-#	$(gmeversion)/gme/Vgm_Emu_Impl.cpp\
-#	$(gmeversion)/gme/Effects_Buffer.cpp\
-#	$(gmeversion)/gme/Hes_Apu.cpp\
-#	$(gmeversion)/gme/Nes_Apu.cpp\
-#	$(gmeversion)/gme/Sap_Cpu.cpp\
-#	$(gmeversion)/gme/Ym2413_Emu.cpp\
-#	$(gmeversion)/gme/Fir_Resampler.cpp\
-#	$(gmeversion)/gme/Hes_Cpu.cpp\
-#	$(gmeversion)/gme/Nes_Cpu.cpp\
-#	$(gmeversion)/gme/Sap_Emu.cpp\
-#	$(gmeversion)/gme/Ym2612_Emu.cpp\
-#	$(gmeversion)/gme/Ay_Apu.h\
-#	$(gmeversion)/gme/Ay_Cpu.h\
-#	$(gmeversion)/gme/Ay_Emu.h\
-#	$(gmeversion)/gme/blargg_common.h\
-#	$(gmeversion)/gme/blargg_config.h\
-#	$(gmeversion)/gme/blargg_endian.h\
-#	$(gmeversion)/gme/blargg_source.h\
-#	$(gmeversion)/gme/Blip_Buffer.h\
-#	$(gmeversion)/gme/Classic_Emu.h\
-#	$(gmeversion)/gme/Data_Reader.h\
-#	$(gmeversion)/gme/Dual_Resampler.h\
-#	$(gmeversion)/gme/Effects_Buffer.h\
-#	$(gmeversion)/gme/Fir_Resampler.h\
-#	$(gmeversion)/gme/Gb_Apu.h\
-#	$(gmeversion)/gme/Gb_Cpu.h\
-#	$(gmeversion)/gme/gb_cpu_io.h\
-#	$(gmeversion)/gme/Gb_Oscs.h\
-#	$(gmeversion)/gme/Gbs_Emu.h\
-#	$(gmeversion)/gme/Gme_File.h\
-#	$(gmeversion)/gme/gme.h\
-#	$(gmeversion)/gme/Gym_Emu.h\
-#	$(gmeversion)/gme/Hes_Apu.h\
-#	$(gmeversion)/gme/Hes_Cpu.h\
-#	$(gmeversion)/gme/hes_cpu_io.h\
-#	$(gmeversion)/gme/Hes_Emu.h\
-#	$(gmeversion)/gme/Kss_Cpu.h\
-#	$(gmeversion)/gme/Kss_Emu.h\
-#	$(gmeversion)/gme/Kss_Scc_Apu.h\
-#	$(gmeversion)/gme/M3u_Playlist.h\
-#	$(gmeversion)/gme/Multi_Buffer.h\
-#	$(gmeversion)/gme/Music_Emu.h\
-#	$(gmeversion)/gme/Nes_Apu.h\
-#	$(gmeversion)/gme/Nes_Cpu.h\
-#	$(gmeversion)/gme/nes_cpu_io.h\
-#	$(gmeversion)/gme/Nes_Fme7_Apu.h\
-#	$(gmeversion)/gme/Nes_Namco_Apu.h\
-#	$(gmeversion)/gme/Nes_Oscs.h\
-#	$(gmeversion)/gme/Nes_Vrc6_Apu.h\
-#	$(gmeversion)/gme/Nsfe_Emu.h\
-#	$(gmeversion)/gme/Nsf_Emu.h\
-#	$(gmeversion)/gme/Sap_Apu.h\
-#	$(gmeversion)/gme/Sap_Cpu.h\
-#	$(gmeversion)/gme/sap_cpu_io.h\
-#	$(gmeversion)/gme/Sap_Emu.h\
-#	$(gmeversion)/gme/Sms_Apu.h\
-#	$(gmeversion)/gme/Sms_Oscs.h\
-#	$(gmeversion)/gme/Snes_Spc.h\
-#	$(gmeversion)/gme/Spc_Cpu.h\
-#	$(gmeversion)/gme/Spc_Dsp.h\
-#	$(gmeversion)/gme/Spc_Emu.h\
-#	$(gmeversion)/gme/Vgm_Emu.h\
-#	$(gmeversion)/gme/Vgm_Emu_Impl.h\
-#	$(gmeversion)/gme/Ym2413_Emu.h\
-#	$(gmeversion)/gme/Ym2612_Emu.h\
-#	$(gmeversion)/gme/gme_types.h\
-#	$(gmeversion)/gme/Spc_Filter.cpp\
-#	$(gmeversion)/gme/Spc_Filter.h
- at HAVE_GME_TRUE@gme_la_LDFLAGS = -module $(NOCPPLIB)
+ at HAVE_GME_TRUE@gme_la_LDFLAGS = -module -avoid-version $(NOCPPLIB)
 @HAVE_GME_TRUE at gme_la_LIBADD = $(ZLIB_LIBS)
 @HAVE_GME_TRUE at AM_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -I$(gmepath) -std=c99 -DGME_VERSION_055
- at HAVE_GME_TRUE@AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -nostdlib -fno-unwind-tables
+ at HAVE_GME_TRUE@AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fno-unwind-tables
 all: all-am
 
 .SUFFIXES:
@@ -953,6 +830,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -979,14 +857,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 gme.la: $(gme_la_OBJECTS) $(gme_la_DEPENDENCIES) $(EXTRA_gme_la_DEPENDENCIES) 
-	$(gme_la_LINK) $(am_gme_la_rpath) $(gme_la_OBJECTS) $(gme_la_LIBADD) $(LIBS)
+	$(AM_V_CXXLD)$(gme_la_LINK) $(am_gme_la_rpath) $(gme_la_OBJECTS) $(gme_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -1078,613 +959,613 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ymdeltat.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 s_deltat.lo: $(gmeversion)/gme/s_deltat.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_deltat.lo -MD -MP -MF $(DEPDIR)/s_deltat.Tpo -c -o s_deltat.lo `test -f '$(gmeversion)/gme/s_deltat.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_deltat.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/s_deltat.Tpo $(DEPDIR)/s_deltat.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gmeversion)/gme/s_deltat.c' object='s_deltat.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_deltat.lo -MD -MP -MF $(DEPDIR)/s_deltat.Tpo -c -o s_deltat.lo `test -f '$(gmeversion)/gme/s_deltat.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_deltat.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/s_deltat.Tpo $(DEPDIR)/s_deltat.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(gmeversion)/gme/s_deltat.c' object='s_deltat.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_deltat.lo `test -f '$(gmeversion)/gme/s_deltat.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_deltat.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_deltat.lo `test -f '$(gmeversion)/gme/s_deltat.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_deltat.c
 
 s_logtbl.lo: $(gmeversion)/gme/s_logtbl.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_logtbl.lo -MD -MP -MF $(DEPDIR)/s_logtbl.Tpo -c -o s_logtbl.lo `test -f '$(gmeversion)/gme/s_logtbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_logtbl.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/s_logtbl.Tpo $(DEPDIR)/s_logtbl.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gmeversion)/gme/s_logtbl.c' object='s_logtbl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_logtbl.lo -MD -MP -MF $(DEPDIR)/s_logtbl.Tpo -c -o s_logtbl.lo `test -f '$(gmeversion)/gme/s_logtbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_logtbl.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/s_logtbl.Tpo $(DEPDIR)/s_logtbl.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(gmeversion)/gme/s_logtbl.c' object='s_logtbl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_logtbl.lo `test -f '$(gmeversion)/gme/s_logtbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_logtbl.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_logtbl.lo `test -f '$(gmeversion)/gme/s_logtbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_logtbl.c
 
 s_opl.lo: $(gmeversion)/gme/s_opl.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_opl.lo -MD -MP -MF $(DEPDIR)/s_opl.Tpo -c -o s_opl.lo `test -f '$(gmeversion)/gme/s_opl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opl.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/s_opl.Tpo $(DEPDIR)/s_opl.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gmeversion)/gme/s_opl.c' object='s_opl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_opl.lo -MD -MP -MF $(DEPDIR)/s_opl.Tpo -c -o s_opl.lo `test -f '$(gmeversion)/gme/s_opl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opl.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/s_opl.Tpo $(DEPDIR)/s_opl.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(gmeversion)/gme/s_opl.c' object='s_opl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_opl.lo `test -f '$(gmeversion)/gme/s_opl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opl.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_opl.lo `test -f '$(gmeversion)/gme/s_opl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opl.c
 
 s_opltbl.lo: $(gmeversion)/gme/s_opltbl.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_opltbl.lo -MD -MP -MF $(DEPDIR)/s_opltbl.Tpo -c -o s_opltbl.lo `test -f '$(gmeversion)/gme/s_opltbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opltbl.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/s_opltbl.Tpo $(DEPDIR)/s_opltbl.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gmeversion)/gme/s_opltbl.c' object='s_opltbl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_opltbl.lo -MD -MP -MF $(DEPDIR)/s_opltbl.Tpo -c -o s_opltbl.lo `test -f '$(gmeversion)/gme/s_opltbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opltbl.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/s_opltbl.Tpo $(DEPDIR)/s_opltbl.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(gmeversion)/gme/s_opltbl.c' object='s_opltbl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_opltbl.lo `test -f '$(gmeversion)/gme/s_opltbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opltbl.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_opltbl.lo `test -f '$(gmeversion)/gme/s_opltbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opltbl.c
 
 ym2413.lo: $(gmeversion)/gme/ym2413.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ym2413.lo -MD -MP -MF $(DEPDIR)/ym2413.Tpo -c -o ym2413.lo `test -f '$(gmeversion)/gme/ym2413.c' || echo '$(srcdir)/'`$(gmeversion)/gme/ym2413.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ym2413.Tpo $(DEPDIR)/ym2413.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gmeversion)/gme/ym2413.c' object='ym2413.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ym2413.lo -MD -MP -MF $(DEPDIR)/ym2413.Tpo -c -o ym2413.lo `test -f '$(gmeversion)/gme/ym2413.c' || echo '$(srcdir)/'`$(gmeversion)/gme/ym2413.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ym2413.Tpo $(DEPDIR)/ym2413.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(gmeversion)/gme/ym2413.c' object='ym2413.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ym2413.lo `test -f '$(gmeversion)/gme/ym2413.c' || echo '$(srcdir)/'`$(gmeversion)/gme/ym2413.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ym2413.lo `test -f '$(gmeversion)/gme/ym2413.c' || echo '$(srcdir)/'`$(gmeversion)/gme/ym2413.c
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 Ay_Apu.lo: $(gmeversion)/gme/Ay_Apu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Apu.lo -MD -MP -MF $(DEPDIR)/Ay_Apu.Tpo -c -o Ay_Apu.lo `test -f '$(gmeversion)/gme/Ay_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Apu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Ay_Apu.Tpo $(DEPDIR)/Ay_Apu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Ay_Apu.cpp' object='Ay_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Apu.lo -MD -MP -MF $(DEPDIR)/Ay_Apu.Tpo -c -o Ay_Apu.lo `test -f '$(gmeversion)/gme/Ay_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Apu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Ay_Apu.Tpo $(DEPDIR)/Ay_Apu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Ay_Apu.cpp' object='Ay_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Apu.lo `test -f '$(gmeversion)/gme/Ay_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Apu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Apu.lo `test -f '$(gmeversion)/gme/Ay_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Apu.cpp
 
 Ay_Core.lo: $(gmeversion)/gme/Ay_Core.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Core.lo -MD -MP -MF $(DEPDIR)/Ay_Core.Tpo -c -o Ay_Core.lo `test -f '$(gmeversion)/gme/Ay_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Core.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Ay_Core.Tpo $(DEPDIR)/Ay_Core.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Ay_Core.cpp' object='Ay_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Core.lo -MD -MP -MF $(DEPDIR)/Ay_Core.Tpo -c -o Ay_Core.lo `test -f '$(gmeversion)/gme/Ay_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Core.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Ay_Core.Tpo $(DEPDIR)/Ay_Core.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Ay_Core.cpp' object='Ay_Core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Core.lo `test -f '$(gmeversion)/gme/Ay_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Core.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Core.lo `test -f '$(gmeversion)/gme/Ay_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Core.cpp
 
 Ay_Cpu.lo: $(gmeversion)/gme/Ay_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Cpu.lo -MD -MP -MF $(DEPDIR)/Ay_Cpu.Tpo -c -o Ay_Cpu.lo `test -f '$(gmeversion)/gme/Ay_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Ay_Cpu.Tpo $(DEPDIR)/Ay_Cpu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Ay_Cpu.cpp' object='Ay_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Cpu.lo -MD -MP -MF $(DEPDIR)/Ay_Cpu.Tpo -c -o Ay_Cpu.lo `test -f '$(gmeversion)/gme/Ay_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Cpu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Ay_Cpu.Tpo $(DEPDIR)/Ay_Cpu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Ay_Cpu.cpp' object='Ay_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Cpu.lo `test -f '$(gmeversion)/gme/Ay_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Cpu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Cpu.lo `test -f '$(gmeversion)/gme/Ay_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Cpu.cpp
 
 Ay_Emu.lo: $(gmeversion)/gme/Ay_Emu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Emu.lo -MD -MP -MF $(DEPDIR)/Ay_Emu.Tpo -c -o Ay_Emu.lo `test -f '$(gmeversion)/gme/Ay_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Emu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Ay_Emu.Tpo $(DEPDIR)/Ay_Emu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Ay_Emu.cpp' object='Ay_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Emu.lo -MD -MP -MF $(DEPDIR)/Ay_Emu.Tpo -c -o Ay_Emu.lo `test -f '$(gmeversion)/gme/Ay_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Emu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Ay_Emu.Tpo $(DEPDIR)/Ay_Emu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Ay_Emu.cpp' object='Ay_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Emu.lo `test -f '$(gmeversion)/gme/Ay_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Emu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Emu.lo `test -f '$(gmeversion)/gme/Ay_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Emu.cpp
 
 blargg_common.lo: $(gmeversion)/gme/blargg_common.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT blargg_common.lo -MD -MP -MF $(DEPDIR)/blargg_common.Tpo -c -o blargg_common.lo `test -f '$(gmeversion)/gme/blargg_common.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_common.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/blargg_common.Tpo $(DEPDIR)/blargg_common.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/blargg_common.cpp' object='blargg_common.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT blargg_common.lo -MD -MP -MF $(DEPDIR)/blargg_common.Tpo -c -o blargg_common.lo `test -f '$(gmeversion)/gme/blargg_common.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_common.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/blargg_common.Tpo $(DEPDIR)/blargg_common.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/blargg_common.cpp' object='blargg_common.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o blargg_common.lo `test -f '$(gmeversion)/gme/blargg_common.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_common.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o blargg_common.lo `test -f '$(gmeversion)/gme/blargg_common.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_common.cpp
 
 blargg_errors.lo: $(gmeversion)/gme/blargg_errors.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT blargg_errors.lo -MD -MP -MF $(DEPDIR)/blargg_errors.Tpo -c -o blargg_errors.lo `test -f '$(gmeversion)/gme/blargg_errors.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_errors.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/blargg_errors.Tpo $(DEPDIR)/blargg_errors.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/blargg_errors.cpp' object='blargg_errors.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT blargg_errors.lo -MD -MP -MF $(DEPDIR)/blargg_errors.Tpo -c -o blargg_errors.lo `test -f '$(gmeversion)/gme/blargg_errors.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_errors.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/blargg_errors.Tpo $(DEPDIR)/blargg_errors.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/blargg_errors.cpp' object='blargg_errors.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o blargg_errors.lo `test -f '$(gmeversion)/gme/blargg_errors.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_errors.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o blargg_errors.lo `test -f '$(gmeversion)/gme/blargg_errors.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_errors.cpp
 
 Blip_Buffer.lo: $(gmeversion)/gme/Blip_Buffer.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Blip_Buffer.lo -MD -MP -MF $(DEPDIR)/Blip_Buffer.Tpo -c -o Blip_Buffer.lo `test -f '$(gmeversion)/gme/Blip_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Blip_Buffer.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Blip_Buffer.Tpo $(DEPDIR)/Blip_Buffer.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Blip_Buffer.cpp' object='Blip_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Blip_Buffer.lo -MD -MP -MF $(DEPDIR)/Blip_Buffer.Tpo -c -o Blip_Buffer.lo `test -f '$(gmeversion)/gme/Blip_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Blip_Buffer.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Blip_Buffer.Tpo $(DEPDIR)/Blip_Buffer.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Blip_Buffer.cpp' object='Blip_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Blip_Buffer.lo `test -f '$(gmeversion)/gme/Blip_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Blip_Buffer.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Blip_Buffer.lo `test -f '$(gmeversion)/gme/Blip_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Blip_Buffer.cpp
 
 Classic_Emu.lo: $(gmeversion)/gme/Classic_Emu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Classic_Emu.lo -MD -MP -MF $(DEPDIR)/Classic_Emu.Tpo -c -o Classic_Emu.lo `test -f '$(gmeversion)/gme/Classic_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Classic_Emu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Classic_Emu.Tpo $(DEPDIR)/Classic_Emu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Classic_Emu.cpp' object='Classic_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Classic_Emu.lo -MD -MP -MF $(DEPDIR)/Classic_Emu.Tpo -c -o Classic_Emu.lo `test -f '$(gmeversion)/gme/Classic_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Classic_Emu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Classic_Emu.Tpo $(DEPDIR)/Classic_Emu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Classic_Emu.cpp' object='Classic_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Classic_Emu.lo `test -f '$(gmeversion)/gme/Classic_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Classic_Emu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Classic_Emu.lo `test -f '$(gmeversion)/gme/Classic_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Classic_Emu.cpp
 
 Downsampler.lo: $(gmeversion)/gme/Downsampler.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Downsampler.lo -MD -MP -MF $(DEPDIR)/Downsampler.Tpo -c -o Downsampler.lo `test -f '$(gmeversion)/gme/Downsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Downsampler.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Downsampler.Tpo $(DEPDIR)/Downsampler.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Downsampler.cpp' object='Downsampler.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Downsampler.lo -MD -MP -MF $(DEPDIR)/Downsampler.Tpo -c -o Downsampler.lo `test -f '$(gmeversion)/gme/Downsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Downsampler.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Downsampler.Tpo $(DEPDIR)/Downsampler.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Downsampler.cpp' object='Downsampler.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Downsampler.lo `test -f '$(gmeversion)/gme/Downsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Downsampler.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Downsampler.lo `test -f '$(gmeversion)/gme/Downsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Downsampler.cpp
 
 Dual_Resampler.lo: $(gmeversion)/gme/Dual_Resampler.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Dual_Resampler.lo -MD -MP -MF $(DEPDIR)/Dual_Resampler.Tpo -c -o Dual_Resampler.lo `test -f '$(gmeversion)/gme/Dual_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Dual_Resampler.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Dual_Resampler.Tpo $(DEPDIR)/Dual_Resampler.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Dual_Resampler.cpp' object='Dual_Resampler.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Dual_Resampler.lo -MD -MP -MF $(DEPDIR)/Dual_Resampler.Tpo -c -o Dual_Resampler.lo `test -f '$(gmeversion)/gme/Dual_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Dual_Resampler.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Dual_Resampler.Tpo $(DEPDIR)/Dual_Resampler.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Dual_Resampler.cpp' object='Dual_Resampler.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Dual_Resampler.lo `test -f '$(gmeversion)/gme/Dual_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Dual_Resampler.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Dual_Resampler.lo `test -f '$(gmeversion)/gme/Dual_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Dual_Resampler.cpp
 
 Effects_Buffer.lo: $(gmeversion)/gme/Effects_Buffer.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Effects_Buffer.lo -MD -MP -MF $(DEPDIR)/Effects_Buffer.Tpo -c -o Effects_Buffer.lo `test -f '$(gmeversion)/gme/Effects_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Effects_Buffer.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Effects_Buffer.Tpo $(DEPDIR)/Effects_Buffer.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Effects_Buffer.cpp' object='Effects_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Effects_Buffer.lo -MD -MP -MF $(DEPDIR)/Effects_Buffer.Tpo -c -o Effects_Buffer.lo `test -f '$(gmeversion)/gme/Effects_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Effects_Buffer.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Effects_Buffer.Tpo $(DEPDIR)/Effects_Buffer.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Effects_Buffer.cpp' object='Effects_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Effects_Buffer.lo `test -f '$(gmeversion)/gme/Effects_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Effects_Buffer.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Effects_Buffer.lo `test -f '$(gmeversion)/gme/Effects_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Effects_Buffer.cpp
 
 emu2413.lo: $(gmeversion)/gme/emu2413.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT emu2413.lo -MD -MP -MF $(DEPDIR)/emu2413.Tpo -c -o emu2413.lo `test -f '$(gmeversion)/gme/emu2413.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/emu2413.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/emu2413.Tpo $(DEPDIR)/emu2413.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/emu2413.cpp' object='emu2413.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT emu2413.lo -MD -MP -MF $(DEPDIR)/emu2413.Tpo -c -o emu2413.lo `test -f '$(gmeversion)/gme/emu2413.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/emu2413.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/emu2413.Tpo $(DEPDIR)/emu2413.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/emu2413.cpp' object='emu2413.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o emu2413.lo `test -f '$(gmeversion)/gme/emu2413.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/emu2413.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o emu2413.lo `test -f '$(gmeversion)/gme/emu2413.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/emu2413.cpp
 
 Fir_Resampler.lo: $(gmeversion)/gme/Fir_Resampler.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Fir_Resampler.lo -MD -MP -MF $(DEPDIR)/Fir_Resampler.Tpo -c -o Fir_Resampler.lo `test -f '$(gmeversion)/gme/Fir_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Fir_Resampler.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Fir_Resampler.Tpo $(DEPDIR)/Fir_Resampler.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Fir_Resampler.cpp' object='Fir_Resampler.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Fir_Resampler.lo -MD -MP -MF $(DEPDIR)/Fir_Resampler.Tpo -c -o Fir_Resampler.lo `test -f '$(gmeversion)/gme/Fir_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Fir_Resampler.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Fir_Resampler.Tpo $(DEPDIR)/Fir_Resampler.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Fir_Resampler.cpp' object='Fir_Resampler.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Fir_Resampler.lo `test -f '$(gmeversion)/gme/Fir_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Fir_Resampler.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Fir_Resampler.lo `test -f '$(gmeversion)/gme/Fir_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Fir_Resampler.cpp
 
 fmopl.lo: $(gmeversion)/gme/fmopl.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fmopl.lo -MD -MP -MF $(DEPDIR)/fmopl.Tpo -c -o fmopl.lo `test -f '$(gmeversion)/gme/fmopl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/fmopl.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/fmopl.Tpo $(DEPDIR)/fmopl.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/fmopl.cpp' object='fmopl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fmopl.lo -MD -MP -MF $(DEPDIR)/fmopl.Tpo -c -o fmopl.lo `test -f '$(gmeversion)/gme/fmopl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/fmopl.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/fmopl.Tpo $(DEPDIR)/fmopl.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/fmopl.cpp' object='fmopl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fmopl.lo `test -f '$(gmeversion)/gme/fmopl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/fmopl.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fmopl.lo `test -f '$(gmeversion)/gme/fmopl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/fmopl.cpp
 
 Gb_Apu.lo: $(gmeversion)/gme/Gb_Apu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Apu.lo -MD -MP -MF $(DEPDIR)/Gb_Apu.Tpo -c -o Gb_Apu.lo `test -f '$(gmeversion)/gme/Gb_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Apu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Gb_Apu.Tpo $(DEPDIR)/Gb_Apu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Gb_Apu.cpp' object='Gb_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Apu.lo -MD -MP -MF $(DEPDIR)/Gb_Apu.Tpo -c -o Gb_Apu.lo `test -f '$(gmeversion)/gme/Gb_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Apu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gb_Apu.Tpo $(DEPDIR)/Gb_Apu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Gb_Apu.cpp' object='Gb_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Apu.lo `test -f '$(gmeversion)/gme/Gb_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Apu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Apu.lo `test -f '$(gmeversion)/gme/Gb_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Apu.cpp
 
 Gb_Cpu.lo: $(gmeversion)/gme/Gb_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Cpu.lo -MD -MP -MF $(DEPDIR)/Gb_Cpu.Tpo -c -o Gb_Cpu.lo `test -f '$(gmeversion)/gme/Gb_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Gb_Cpu.Tpo $(DEPDIR)/Gb_Cpu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Gb_Cpu.cpp' object='Gb_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Cpu.lo -MD -MP -MF $(DEPDIR)/Gb_Cpu.Tpo -c -o Gb_Cpu.lo `test -f '$(gmeversion)/gme/Gb_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Cpu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gb_Cpu.Tpo $(DEPDIR)/Gb_Cpu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Gb_Cpu.cpp' object='Gb_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Cpu.lo `test -f '$(gmeversion)/gme/Gb_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Cpu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Cpu.lo `test -f '$(gmeversion)/gme/Gb_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Cpu.cpp
 
 Gb_Oscs.lo: $(gmeversion)/gme/Gb_Oscs.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Oscs.lo -MD -MP -MF $(DEPDIR)/Gb_Oscs.Tpo -c -o Gb_Oscs.lo `test -f '$(gmeversion)/gme/Gb_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Oscs.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Gb_Oscs.Tpo $(DEPDIR)/Gb_Oscs.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Gb_Oscs.cpp' object='Gb_Oscs.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Oscs.lo -MD -MP -MF $(DEPDIR)/Gb_Oscs.Tpo -c -o Gb_Oscs.lo `test -f '$(gmeversion)/gme/Gb_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Oscs.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gb_Oscs.Tpo $(DEPDIR)/Gb_Oscs.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Gb_Oscs.cpp' object='Gb_Oscs.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Oscs.lo `test -f '$(gmeversion)/gme/Gb_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Oscs.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Oscs.lo `test -f '$(gmeversion)/gme/Gb_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Oscs.cpp
 
 Gbs_Core.lo: $(gmeversion)/gme/Gbs_Core.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gbs_Core.lo -MD -MP -MF $(DEPDIR)/Gbs_Core.Tpo -c -o Gbs_Core.lo `test -f '$(gmeversion)/gme/Gbs_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Core.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Gbs_Core.Tpo $(DEPDIR)/Gbs_Core.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Gbs_Core.cpp' object='Gbs_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gbs_Core.lo -MD -MP -MF $(DEPDIR)/Gbs_Core.Tpo -c -o Gbs_Core.lo `test -f '$(gmeversion)/gme/Gbs_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Core.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gbs_Core.Tpo $(DEPDIR)/Gbs_Core.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Gbs_Core.cpp' object='Gbs_Core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gbs_Core.lo `test -f '$(gmeversion)/gme/Gbs_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Core.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gbs_Core.lo `test -f '$(gmeversion)/gme/Gbs_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Core.cpp
 
 Gbs_Cpu.lo: $(gmeversion)/gme/Gbs_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gbs_Cpu.lo -MD -MP -MF $(DEPDIR)/Gbs_Cpu.Tpo -c -o Gbs_Cpu.lo `test -f '$(gmeversion)/gme/Gbs_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Gbs_Cpu.Tpo $(DEPDIR)/Gbs_Cpu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Gbs_Cpu.cpp' object='Gbs_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gbs_Cpu.lo -MD -MP -MF $(DEPDIR)/Gbs_Cpu.Tpo -c -o Gbs_Cpu.lo `test -f '$(gmeversion)/gme/Gbs_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Cpu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gbs_Cpu.Tpo $(DEPDIR)/Gbs_Cpu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Gbs_Cpu.cpp' object='Gbs_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gbs_Cpu.lo `test -f '$(gmeversion)/gme/Gbs_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Cpu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gbs_Cpu.lo `test -f '$(gmeversion)/gme/Gbs_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Cpu.cpp
 
 Gbs_Emu.lo: $(gmeversion)/gme/Gbs_Emu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gbs_Emu.lo -MD -MP -MF $(DEPDIR)/Gbs_Emu.Tpo -c -o Gbs_Emu.lo `test -f '$(gmeversion)/gme/Gbs_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Emu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Gbs_Emu.Tpo $(DEPDIR)/Gbs_Emu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Gbs_Emu.cpp' object='Gbs_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gbs_Emu.lo -MD -MP -MF $(DEPDIR)/Gbs_Emu.Tpo -c -o Gbs_Emu.lo `test -f '$(gmeversion)/gme/Gbs_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Emu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gbs_Emu.Tpo $(DEPDIR)/Gbs_Emu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Gbs_Emu.cpp' object='Gbs_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gbs_Emu.lo `test -f '$(gmeversion)/gme/Gbs_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Emu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gbs_Emu.lo `test -f '$(gmeversion)/gme/Gbs_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Emu.cpp
 
 gme.lo: $(gmeversion)/gme/gme.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gme.lo -MD -MP -MF $(DEPDIR)/gme.Tpo -c -o gme.lo `test -f '$(gmeversion)/gme/gme.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/gme.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gme.Tpo $(DEPDIR)/gme.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/gme.cpp' object='gme.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gme.lo -MD -MP -MF $(DEPDIR)/gme.Tpo -c -o gme.lo `test -f '$(gmeversion)/gme/gme.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/gme.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gme.Tpo $(DEPDIR)/gme.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/gme.cpp' object='gme.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gme.lo `test -f '$(gmeversion)/gme/gme.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/gme.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gme.lo `test -f '$(gmeversion)/gme/gme.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/gme.cpp
 
 Gme_File.lo: $(gmeversion)/gme/Gme_File.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gme_File.lo -MD -MP -MF $(DEPDIR)/Gme_File.Tpo -c -o Gme_File.lo `test -f '$(gmeversion)/gme/Gme_File.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_File.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Gme_File.Tpo $(DEPDIR)/Gme_File.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Gme_File.cpp' object='Gme_File.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gme_File.lo -MD -MP -MF $(DEPDIR)/Gme_File.Tpo -c -o Gme_File.lo `test -f '$(gmeversion)/gme/Gme_File.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_File.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gme_File.Tpo $(DEPDIR)/Gme_File.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Gme_File.cpp' object='Gme_File.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gme_File.lo `test -f '$(gmeversion)/gme/Gme_File.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_File.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gme_File.lo `test -f '$(gmeversion)/gme/Gme_File.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_File.cpp
 
 Gme_Loader.lo: $(gmeversion)/gme/Gme_Loader.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gme_Loader.lo -MD -MP -MF $(DEPDIR)/Gme_Loader.Tpo -c -o Gme_Loader.lo `test -f '$(gmeversion)/gme/Gme_Loader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_Loader.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Gme_Loader.Tpo $(DEPDIR)/Gme_Loader.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Gme_Loader.cpp' object='Gme_Loader.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gme_Loader.lo -MD -MP -MF $(DEPDIR)/Gme_Loader.Tpo -c -o Gme_Loader.lo `test -f '$(gmeversion)/gme/Gme_Loader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_Loader.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gme_Loader.Tpo $(DEPDIR)/Gme_Loader.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Gme_Loader.cpp' object='Gme_Loader.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gme_Loader.lo `test -f '$(gmeversion)/gme/Gme_Loader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_Loader.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gme_Loader.lo `test -f '$(gmeversion)/gme/Gme_Loader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_Loader.cpp
 
 Gym_Emu.lo: $(gmeversion)/gme/Gym_Emu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gym_Emu.lo -MD -MP -MF $(DEPDIR)/Gym_Emu.Tpo -c -o Gym_Emu.lo `test -f '$(gmeversion)/gme/Gym_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gym_Emu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Gym_Emu.Tpo $(DEPDIR)/Gym_Emu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Gym_Emu.cpp' object='Gym_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gym_Emu.lo -MD -MP -MF $(DEPDIR)/Gym_Emu.Tpo -c -o Gym_Emu.lo `test -f '$(gmeversion)/gme/Gym_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gym_Emu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gym_Emu.Tpo $(DEPDIR)/Gym_Emu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Gym_Emu.cpp' object='Gym_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gym_Emu.lo `test -f '$(gmeversion)/gme/Gym_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gym_Emu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gym_Emu.lo `test -f '$(gmeversion)/gme/Gym_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gym_Emu.cpp
 
 Hes_Apu_Adpcm.lo: $(gmeversion)/gme/Hes_Apu_Adpcm.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Apu_Adpcm.lo -MD -MP -MF $(DEPDIR)/Hes_Apu_Adpcm.Tpo -c -o Hes_Apu_Adpcm.lo `test -f '$(gmeversion)/gme/Hes_Apu_Adpcm.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu_Adpcm.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Hes_Apu_Adpcm.Tpo $(DEPDIR)/Hes_Apu_Adpcm.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Hes_Apu_Adpcm.cpp' object='Hes_Apu_Adpcm.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Apu_Adpcm.lo -MD -MP -MF $(DEPDIR)/Hes_Apu_Adpcm.Tpo -c -o Hes_Apu_Adpcm.lo `test -f '$(gmeversion)/gme/Hes_Apu_Adpcm.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu_Adpcm.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Hes_Apu_Adpcm.Tpo $(DEPDIR)/Hes_Apu_Adpcm.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Hes_Apu_Adpcm.cpp' object='Hes_Apu_Adpcm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Apu_Adpcm.lo `test -f '$(gmeversion)/gme/Hes_Apu_Adpcm.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu_Adpcm.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Apu_Adpcm.lo `test -f '$(gmeversion)/gme/Hes_Apu_Adpcm.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu_Adpcm.cpp
 
 Hes_Apu.lo: $(gmeversion)/gme/Hes_Apu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Apu.lo -MD -MP -MF $(DEPDIR)/Hes_Apu.Tpo -c -o Hes_Apu.lo `test -f '$(gmeversion)/gme/Hes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Hes_Apu.Tpo $(DEPDIR)/Hes_Apu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Hes_Apu.cpp' object='Hes_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Apu.lo -MD -MP -MF $(DEPDIR)/Hes_Apu.Tpo -c -o Hes_Apu.lo `test -f '$(gmeversion)/gme/Hes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Hes_Apu.Tpo $(DEPDIR)/Hes_Apu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Hes_Apu.cpp' object='Hes_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Apu.lo `test -f '$(gmeversion)/gme/Hes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Apu.lo `test -f '$(gmeversion)/gme/Hes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu.cpp
 
 Hes_Core.lo: $(gmeversion)/gme/Hes_Core.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Core.lo -MD -MP -MF $(DEPDIR)/Hes_Core.Tpo -c -o Hes_Core.lo `test -f '$(gmeversion)/gme/Hes_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Core.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Hes_Core.Tpo $(DEPDIR)/Hes_Core.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Hes_Core.cpp' object='Hes_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Core.lo -MD -MP -MF $(DEPDIR)/Hes_Core.Tpo -c -o Hes_Core.lo `test -f '$(gmeversion)/gme/Hes_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Core.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Hes_Core.Tpo $(DEPDIR)/Hes_Core.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Hes_Core.cpp' object='Hes_Core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Core.lo `test -f '$(gmeversion)/gme/Hes_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Core.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Core.lo `test -f '$(gmeversion)/gme/Hes_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Core.cpp
 
 Hes_Cpu.lo: $(gmeversion)/gme/Hes_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Cpu.lo -MD -MP -MF $(DEPDIR)/Hes_Cpu.Tpo -c -o Hes_Cpu.lo `test -f '$(gmeversion)/gme/Hes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Hes_Cpu.Tpo $(DEPDIR)/Hes_Cpu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Hes_Cpu.cpp' object='Hes_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Cpu.lo -MD -MP -MF $(DEPDIR)/Hes_Cpu.Tpo -c -o Hes_Cpu.lo `test -f '$(gmeversion)/gme/Hes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Cpu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Hes_Cpu.Tpo $(DEPDIR)/Hes_Cpu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Hes_Cpu.cpp' object='Hes_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Cpu.lo `test -f '$(gmeversion)/gme/Hes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Cpu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Cpu.lo `test -f '$(gmeversion)/gme/Hes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Cpu.cpp
 
 Hes_Emu.lo: $(gmeversion)/gme/Hes_Emu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Emu.lo -MD -MP -MF $(DEPDIR)/Hes_Emu.Tpo -c -o Hes_Emu.lo `test -f '$(gmeversion)/gme/Hes_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Emu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Hes_Emu.Tpo $(DEPDIR)/Hes_Emu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Hes_Emu.cpp' object='Hes_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Emu.lo -MD -MP -MF $(DEPDIR)/Hes_Emu.Tpo -c -o Hes_Emu.lo `test -f '$(gmeversion)/gme/Hes_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Emu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Hes_Emu.Tpo $(DEPDIR)/Hes_Emu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Hes_Emu.cpp' object='Hes_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Emu.lo `test -f '$(gmeversion)/gme/Hes_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Emu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Emu.lo `test -f '$(gmeversion)/gme/Hes_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Emu.cpp
 
 Kss_Core.lo: $(gmeversion)/gme/Kss_Core.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Core.lo -MD -MP -MF $(DEPDIR)/Kss_Core.Tpo -c -o Kss_Core.lo `test -f '$(gmeversion)/gme/Kss_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Core.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Kss_Core.Tpo $(DEPDIR)/Kss_Core.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Kss_Core.cpp' object='Kss_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Core.lo -MD -MP -MF $(DEPDIR)/Kss_Core.Tpo -c -o Kss_Core.lo `test -f '$(gmeversion)/gme/Kss_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Core.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Kss_Core.Tpo $(DEPDIR)/Kss_Core.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Kss_Core.cpp' object='Kss_Core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Core.lo `test -f '$(gmeversion)/gme/Kss_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Core.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Core.lo `test -f '$(gmeversion)/gme/Kss_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Core.cpp
 
 Kss_Cpu.lo: $(gmeversion)/gme/Kss_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Cpu.lo -MD -MP -MF $(DEPDIR)/Kss_Cpu.Tpo -c -o Kss_Cpu.lo `test -f '$(gmeversion)/gme/Kss_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Kss_Cpu.Tpo $(DEPDIR)/Kss_Cpu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Kss_Cpu.cpp' object='Kss_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Cpu.lo -MD -MP -MF $(DEPDIR)/Kss_Cpu.Tpo -c -o Kss_Cpu.lo `test -f '$(gmeversion)/gme/Kss_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Cpu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Kss_Cpu.Tpo $(DEPDIR)/Kss_Cpu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Kss_Cpu.cpp' object='Kss_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Cpu.lo `test -f '$(gmeversion)/gme/Kss_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Cpu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Cpu.lo `test -f '$(gmeversion)/gme/Kss_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Cpu.cpp
 
 Kss_Emu.lo: $(gmeversion)/gme/Kss_Emu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Emu.lo -MD -MP -MF $(DEPDIR)/Kss_Emu.Tpo -c -o Kss_Emu.lo `test -f '$(gmeversion)/gme/Kss_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Emu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Kss_Emu.Tpo $(DEPDIR)/Kss_Emu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Kss_Emu.cpp' object='Kss_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Emu.lo -MD -MP -MF $(DEPDIR)/Kss_Emu.Tpo -c -o Kss_Emu.lo `test -f '$(gmeversion)/gme/Kss_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Emu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Kss_Emu.Tpo $(DEPDIR)/Kss_Emu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Kss_Emu.cpp' object='Kss_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Emu.lo `test -f '$(gmeversion)/gme/Kss_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Emu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Emu.lo `test -f '$(gmeversion)/gme/Kss_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Emu.cpp
 
 Kss_Scc_Apu.lo: $(gmeversion)/gme/Kss_Scc_Apu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Scc_Apu.lo -MD -MP -MF $(DEPDIR)/Kss_Scc_Apu.Tpo -c -o Kss_Scc_Apu.lo `test -f '$(gmeversion)/gme/Kss_Scc_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Scc_Apu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Kss_Scc_Apu.Tpo $(DEPDIR)/Kss_Scc_Apu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Kss_Scc_Apu.cpp' object='Kss_Scc_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Scc_Apu.lo -MD -MP -MF $(DEPDIR)/Kss_Scc_Apu.Tpo -c -o Kss_Scc_Apu.lo `test -f '$(gmeversion)/gme/Kss_Scc_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Scc_Apu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Kss_Scc_Apu.Tpo $(DEPDIR)/Kss_Scc_Apu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Kss_Scc_Apu.cpp' object='Kss_Scc_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Scc_Apu.lo `test -f '$(gmeversion)/gme/Kss_Scc_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Scc_Apu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Scc_Apu.lo `test -f '$(gmeversion)/gme/Kss_Scc_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Scc_Apu.cpp
 
 M3u_Playlist.lo: $(gmeversion)/gme/M3u_Playlist.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT M3u_Playlist.lo -MD -MP -MF $(DEPDIR)/M3u_Playlist.Tpo -c -o M3u_Playlist.lo `test -f '$(gmeversion)/gme/M3u_Playlist.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/M3u_Playlist.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/M3u_Playlist.Tpo $(DEPDIR)/M3u_Playlist.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/M3u_Playlist.cpp' object='M3u_Playlist.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT M3u_Playlist.lo -MD -MP -MF $(DEPDIR)/M3u_Playlist.Tpo -c -o M3u_Playlist.lo `test -f '$(gmeversion)/gme/M3u_Playlist.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/M3u_Playlist.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/M3u_Playlist.Tpo $(DEPDIR)/M3u_Playlist.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/M3u_Playlist.cpp' object='M3u_Playlist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o M3u_Playlist.lo `test -f '$(gmeversion)/gme/M3u_Playlist.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/M3u_Playlist.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o M3u_Playlist.lo `test -f '$(gmeversion)/gme/M3u_Playlist.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/M3u_Playlist.cpp
 
 Multi_Buffer.lo: $(gmeversion)/gme/Multi_Buffer.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Multi_Buffer.lo -MD -MP -MF $(DEPDIR)/Multi_Buffer.Tpo -c -o Multi_Buffer.lo `test -f '$(gmeversion)/gme/Multi_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Multi_Buffer.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Multi_Buffer.Tpo $(DEPDIR)/Multi_Buffer.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Multi_Buffer.cpp' object='Multi_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Multi_Buffer.lo -MD -MP -MF $(DEPDIR)/Multi_Buffer.Tpo -c -o Multi_Buffer.lo `test -f '$(gmeversion)/gme/Multi_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Multi_Buffer.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Multi_Buffer.Tpo $(DEPDIR)/Multi_Buffer.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Multi_Buffer.cpp' object='Multi_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Multi_Buffer.lo `test -f '$(gmeversion)/gme/Multi_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Multi_Buffer.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Multi_Buffer.lo `test -f '$(gmeversion)/gme/Multi_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Multi_Buffer.cpp
 
 Music_Emu.lo: $(gmeversion)/gme/Music_Emu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Music_Emu.lo -MD -MP -MF $(DEPDIR)/Music_Emu.Tpo -c -o Music_Emu.lo `test -f '$(gmeversion)/gme/Music_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Music_Emu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Music_Emu.Tpo $(DEPDIR)/Music_Emu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Music_Emu.cpp' object='Music_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Music_Emu.lo -MD -MP -MF $(DEPDIR)/Music_Emu.Tpo -c -o Music_Emu.lo `test -f '$(gmeversion)/gme/Music_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Music_Emu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Music_Emu.Tpo $(DEPDIR)/Music_Emu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Music_Emu.cpp' object='Music_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Music_Emu.lo `test -f '$(gmeversion)/gme/Music_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Music_Emu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Music_Emu.lo `test -f '$(gmeversion)/gme/Music_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Music_Emu.cpp
 
 Nes_Apu.lo: $(gmeversion)/gme/Nes_Apu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Apu.Tpo -c -o Nes_Apu.lo `test -f '$(gmeversion)/gme/Nes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Apu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nes_Apu.Tpo $(DEPDIR)/Nes_Apu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nes_Apu.cpp' object='Nes_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Apu.Tpo -c -o Nes_Apu.lo `test -f '$(gmeversion)/gme/Nes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Apu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Apu.Tpo $(DEPDIR)/Nes_Apu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nes_Apu.cpp' object='Nes_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Apu.lo `test -f '$(gmeversion)/gme/Nes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Apu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Apu.lo `test -f '$(gmeversion)/gme/Nes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Apu.cpp
 
 Nes_Cpu.lo: $(gmeversion)/gme/Nes_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Cpu.lo -MD -MP -MF $(DEPDIR)/Nes_Cpu.Tpo -c -o Nes_Cpu.lo `test -f '$(gmeversion)/gme/Nes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nes_Cpu.Tpo $(DEPDIR)/Nes_Cpu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nes_Cpu.cpp' object='Nes_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Cpu.lo -MD -MP -MF $(DEPDIR)/Nes_Cpu.Tpo -c -o Nes_Cpu.lo `test -f '$(gmeversion)/gme/Nes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Cpu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Cpu.Tpo $(DEPDIR)/Nes_Cpu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nes_Cpu.cpp' object='Nes_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Cpu.lo `test -f '$(gmeversion)/gme/Nes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Cpu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Cpu.lo `test -f '$(gmeversion)/gme/Nes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Cpu.cpp
 
 Nes_Fds_Apu.lo: $(gmeversion)/gme/Nes_Fds_Apu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Fds_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Fds_Apu.Tpo -c -o Nes_Fds_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fds_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fds_Apu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nes_Fds_Apu.Tpo $(DEPDIR)/Nes_Fds_Apu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nes_Fds_Apu.cpp' object='Nes_Fds_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Fds_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Fds_Apu.Tpo -c -o Nes_Fds_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fds_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fds_Apu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Fds_Apu.Tpo $(DEPDIR)/Nes_Fds_Apu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nes_Fds_Apu.cpp' object='Nes_Fds_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Fds_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fds_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fds_Apu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Fds_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fds_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fds_Apu.cpp
 
 Nes_Fme7_Apu.lo: $(gmeversion)/gme/Nes_Fme7_Apu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Fme7_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Fme7_Apu.Tpo -c -o Nes_Fme7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fme7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fme7_Apu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nes_Fme7_Apu.Tpo $(DEPDIR)/Nes_Fme7_Apu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nes_Fme7_Apu.cpp' object='Nes_Fme7_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Fme7_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Fme7_Apu.Tpo -c -o Nes_Fme7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fme7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fme7_Apu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Fme7_Apu.Tpo $(DEPDIR)/Nes_Fme7_Apu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nes_Fme7_Apu.cpp' object='Nes_Fme7_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Fme7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fme7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fme7_Apu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Fme7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fme7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fme7_Apu.cpp
 
 Nes_Namco_Apu.lo: $(gmeversion)/gme/Nes_Namco_Apu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Namco_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Namco_Apu.Tpo -c -o Nes_Namco_Apu.lo `test -f '$(gmeversion)/gme/Nes_Namco_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Namco_Apu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nes_Namco_Apu.Tpo $(DEPDIR)/Nes_Namco_Apu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nes_Namco_Apu.cpp' object='Nes_Namco_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Namco_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Namco_Apu.Tpo -c -o Nes_Namco_Apu.lo `test -f '$(gmeversion)/gme/Nes_Namco_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Namco_Apu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Namco_Apu.Tpo $(DEPDIR)/Nes_Namco_Apu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nes_Namco_Apu.cpp' object='Nes_Namco_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Namco_Apu.lo `test -f '$(gmeversion)/gme/Nes_Namco_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Namco_Apu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Namco_Apu.lo `test -f '$(gmeversion)/gme/Nes_Namco_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Namco_Apu.cpp
 
 Nes_Oscs.lo: $(gmeversion)/gme/Nes_Oscs.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Oscs.lo -MD -MP -MF $(DEPDIR)/Nes_Oscs.Tpo -c -o Nes_Oscs.lo `test -f '$(gmeversion)/gme/Nes_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Oscs.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nes_Oscs.Tpo $(DEPDIR)/Nes_Oscs.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nes_Oscs.cpp' object='Nes_Oscs.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Oscs.lo -MD -MP -MF $(DEPDIR)/Nes_Oscs.Tpo -c -o Nes_Oscs.lo `test -f '$(gmeversion)/gme/Nes_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Oscs.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Oscs.Tpo $(DEPDIR)/Nes_Oscs.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nes_Oscs.cpp' object='Nes_Oscs.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Oscs.lo `test -f '$(gmeversion)/gme/Nes_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Oscs.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Oscs.lo `test -f '$(gmeversion)/gme/Nes_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Oscs.cpp
 
 Nes_Vrc6_Apu.lo: $(gmeversion)/gme/Nes_Vrc6_Apu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Vrc6_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Vrc6_Apu.Tpo -c -o Nes_Vrc6_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc6_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc6_Apu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nes_Vrc6_Apu.Tpo $(DEPDIR)/Nes_Vrc6_Apu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nes_Vrc6_Apu.cpp' object='Nes_Vrc6_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Vrc6_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Vrc6_Apu.Tpo -c -o Nes_Vrc6_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc6_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc6_Apu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Vrc6_Apu.Tpo $(DEPDIR)/Nes_Vrc6_Apu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nes_Vrc6_Apu.cpp' object='Nes_Vrc6_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Vrc6_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc6_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc6_Apu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Vrc6_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc6_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc6_Apu.cpp
 
 Nes_Vrc7_Apu.lo: $(gmeversion)/gme/Nes_Vrc7_Apu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Vrc7_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Vrc7_Apu.Tpo -c -o Nes_Vrc7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc7_Apu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nes_Vrc7_Apu.Tpo $(DEPDIR)/Nes_Vrc7_Apu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nes_Vrc7_Apu.cpp' object='Nes_Vrc7_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Vrc7_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Vrc7_Apu.Tpo -c -o Nes_Vrc7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc7_Apu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Vrc7_Apu.Tpo $(DEPDIR)/Nes_Vrc7_Apu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nes_Vrc7_Apu.cpp' object='Nes_Vrc7_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Vrc7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc7_Apu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Vrc7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc7_Apu.cpp
 
 Nsf_Core.lo: $(gmeversion)/gme/Nsf_Core.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Core.lo -MD -MP -MF $(DEPDIR)/Nsf_Core.Tpo -c -o Nsf_Core.lo `test -f '$(gmeversion)/gme/Nsf_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Core.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nsf_Core.Tpo $(DEPDIR)/Nsf_Core.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nsf_Core.cpp' object='Nsf_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Core.lo -MD -MP -MF $(DEPDIR)/Nsf_Core.Tpo -c -o Nsf_Core.lo `test -f '$(gmeversion)/gme/Nsf_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Core.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nsf_Core.Tpo $(DEPDIR)/Nsf_Core.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nsf_Core.cpp' object='Nsf_Core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Core.lo `test -f '$(gmeversion)/gme/Nsf_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Core.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Core.lo `test -f '$(gmeversion)/gme/Nsf_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Core.cpp
 
 Nsf_Cpu.lo: $(gmeversion)/gme/Nsf_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Cpu.lo -MD -MP -MF $(DEPDIR)/Nsf_Cpu.Tpo -c -o Nsf_Cpu.lo `test -f '$(gmeversion)/gme/Nsf_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nsf_Cpu.Tpo $(DEPDIR)/Nsf_Cpu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nsf_Cpu.cpp' object='Nsf_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Cpu.lo -MD -MP -MF $(DEPDIR)/Nsf_Cpu.Tpo -c -o Nsf_Cpu.lo `test -f '$(gmeversion)/gme/Nsf_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Cpu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nsf_Cpu.Tpo $(DEPDIR)/Nsf_Cpu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nsf_Cpu.cpp' object='Nsf_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Cpu.lo `test -f '$(gmeversion)/gme/Nsf_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Cpu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Cpu.lo `test -f '$(gmeversion)/gme/Nsf_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Cpu.cpp
 
 Nsfe_Emu.lo: $(gmeversion)/gme/Nsfe_Emu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsfe_Emu.lo -MD -MP -MF $(DEPDIR)/Nsfe_Emu.Tpo -c -o Nsfe_Emu.lo `test -f '$(gmeversion)/gme/Nsfe_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsfe_Emu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nsfe_Emu.Tpo $(DEPDIR)/Nsfe_Emu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nsfe_Emu.cpp' object='Nsfe_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsfe_Emu.lo -MD -MP -MF $(DEPDIR)/Nsfe_Emu.Tpo -c -o Nsfe_Emu.lo `test -f '$(gmeversion)/gme/Nsfe_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsfe_Emu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nsfe_Emu.Tpo $(DEPDIR)/Nsfe_Emu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nsfe_Emu.cpp' object='Nsfe_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsfe_Emu.lo `test -f '$(gmeversion)/gme/Nsfe_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsfe_Emu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsfe_Emu.lo `test -f '$(gmeversion)/gme/Nsfe_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsfe_Emu.cpp
 
 Nsf_Emu.lo: $(gmeversion)/gme/Nsf_Emu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Emu.lo -MD -MP -MF $(DEPDIR)/Nsf_Emu.Tpo -c -o Nsf_Emu.lo `test -f '$(gmeversion)/gme/Nsf_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Emu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nsf_Emu.Tpo $(DEPDIR)/Nsf_Emu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nsf_Emu.cpp' object='Nsf_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Emu.lo -MD -MP -MF $(DEPDIR)/Nsf_Emu.Tpo -c -o Nsf_Emu.lo `test -f '$(gmeversion)/gme/Nsf_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Emu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nsf_Emu.Tpo $(DEPDIR)/Nsf_Emu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nsf_Emu.cpp' object='Nsf_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Emu.lo `test -f '$(gmeversion)/gme/Nsf_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Emu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Emu.lo `test -f '$(gmeversion)/gme/Nsf_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Emu.cpp
 
 Nsf_Impl.lo: $(gmeversion)/gme/Nsf_Impl.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Impl.lo -MD -MP -MF $(DEPDIR)/Nsf_Impl.Tpo -c -o Nsf_Impl.lo `test -f '$(gmeversion)/gme/Nsf_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Impl.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nsf_Impl.Tpo $(DEPDIR)/Nsf_Impl.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nsf_Impl.cpp' object='Nsf_Impl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Impl.lo -MD -MP -MF $(DEPDIR)/Nsf_Impl.Tpo -c -o Nsf_Impl.lo `test -f '$(gmeversion)/gme/Nsf_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Impl.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nsf_Impl.Tpo $(DEPDIR)/Nsf_Impl.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nsf_Impl.cpp' object='Nsf_Impl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Impl.lo `test -f '$(gmeversion)/gme/Nsf_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Impl.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Impl.lo `test -f '$(gmeversion)/gme/Nsf_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Impl.cpp
 
 Opl_Apu.lo: $(gmeversion)/gme/Opl_Apu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Opl_Apu.lo -MD -MP -MF $(DEPDIR)/Opl_Apu.Tpo -c -o Opl_Apu.lo `test -f '$(gmeversion)/gme/Opl_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Opl_Apu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Opl_Apu.Tpo $(DEPDIR)/Opl_Apu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Opl_Apu.cpp' object='Opl_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Opl_Apu.lo -MD -MP -MF $(DEPDIR)/Opl_Apu.Tpo -c -o Opl_Apu.lo `test -f '$(gmeversion)/gme/Opl_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Opl_Apu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Opl_Apu.Tpo $(DEPDIR)/Opl_Apu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Opl_Apu.cpp' object='Opl_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Opl_Apu.lo `test -f '$(gmeversion)/gme/Opl_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Opl_Apu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Opl_Apu.lo `test -f '$(gmeversion)/gme/Opl_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Opl_Apu.cpp
 
 Resampler.lo: $(gmeversion)/gme/Resampler.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Resampler.lo -MD -MP -MF $(DEPDIR)/Resampler.Tpo -c -o Resampler.lo `test -f '$(gmeversion)/gme/Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Resampler.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Resampler.Tpo $(DEPDIR)/Resampler.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Resampler.cpp' object='Resampler.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Resampler.lo -MD -MP -MF $(DEPDIR)/Resampler.Tpo -c -o Resampler.lo `test -f '$(gmeversion)/gme/Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Resampler.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Resampler.Tpo $(DEPDIR)/Resampler.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Resampler.cpp' object='Resampler.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Resampler.lo `test -f '$(gmeversion)/gme/Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Resampler.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Resampler.lo `test -f '$(gmeversion)/gme/Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Resampler.cpp
 
 Rom_Data.lo: $(gmeversion)/gme/Rom_Data.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Rom_Data.lo -MD -MP -MF $(DEPDIR)/Rom_Data.Tpo -c -o Rom_Data.lo `test -f '$(gmeversion)/gme/Rom_Data.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Rom_Data.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Rom_Data.Tpo $(DEPDIR)/Rom_Data.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Rom_Data.cpp' object='Rom_Data.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Rom_Data.lo -MD -MP -MF $(DEPDIR)/Rom_Data.Tpo -c -o Rom_Data.lo `test -f '$(gmeversion)/gme/Rom_Data.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Rom_Data.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Rom_Data.Tpo $(DEPDIR)/Rom_Data.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Rom_Data.cpp' object='Rom_Data.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Rom_Data.lo `test -f '$(gmeversion)/gme/Rom_Data.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Rom_Data.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Rom_Data.lo `test -f '$(gmeversion)/gme/Rom_Data.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Rom_Data.cpp
 
 Sap_Apu.lo: $(gmeversion)/gme/Sap_Apu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Apu.lo -MD -MP -MF $(DEPDIR)/Sap_Apu.Tpo -c -o Sap_Apu.lo `test -f '$(gmeversion)/gme/Sap_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Apu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Sap_Apu.Tpo $(DEPDIR)/Sap_Apu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Sap_Apu.cpp' object='Sap_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Apu.lo -MD -MP -MF $(DEPDIR)/Sap_Apu.Tpo -c -o Sap_Apu.lo `test -f '$(gmeversion)/gme/Sap_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Apu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sap_Apu.Tpo $(DEPDIR)/Sap_Apu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sap_Apu.cpp' object='Sap_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Apu.lo `test -f '$(gmeversion)/gme/Sap_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Apu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Apu.lo `test -f '$(gmeversion)/gme/Sap_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Apu.cpp
 
 Sap_Core.lo: $(gmeversion)/gme/Sap_Core.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Core.lo -MD -MP -MF $(DEPDIR)/Sap_Core.Tpo -c -o Sap_Core.lo `test -f '$(gmeversion)/gme/Sap_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Core.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Sap_Core.Tpo $(DEPDIR)/Sap_Core.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Sap_Core.cpp' object='Sap_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Core.lo -MD -MP -MF $(DEPDIR)/Sap_Core.Tpo -c -o Sap_Core.lo `test -f '$(gmeversion)/gme/Sap_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Core.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sap_Core.Tpo $(DEPDIR)/Sap_Core.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sap_Core.cpp' object='Sap_Core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Core.lo `test -f '$(gmeversion)/gme/Sap_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Core.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Core.lo `test -f '$(gmeversion)/gme/Sap_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Core.cpp
 
 Sap_Cpu.lo: $(gmeversion)/gme/Sap_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Cpu.lo -MD -MP -MF $(DEPDIR)/Sap_Cpu.Tpo -c -o Sap_Cpu.lo `test -f '$(gmeversion)/gme/Sap_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Sap_Cpu.Tpo $(DEPDIR)/Sap_Cpu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Sap_Cpu.cpp' object='Sap_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Cpu.lo -MD -MP -MF $(DEPDIR)/Sap_Cpu.Tpo -c -o Sap_Cpu.lo `test -f '$(gmeversion)/gme/Sap_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Cpu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sap_Cpu.Tpo $(DEPDIR)/Sap_Cpu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sap_Cpu.cpp' object='Sap_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Cpu.lo `test -f '$(gmeversion)/gme/Sap_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Cpu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Cpu.lo `test -f '$(gmeversion)/gme/Sap_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Cpu.cpp
 
 Sap_Emu.lo: $(gmeversion)/gme/Sap_Emu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Emu.lo -MD -MP -MF $(DEPDIR)/Sap_Emu.Tpo -c -o Sap_Emu.lo `test -f '$(gmeversion)/gme/Sap_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Emu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Sap_Emu.Tpo $(DEPDIR)/Sap_Emu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Sap_Emu.cpp' object='Sap_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Emu.lo -MD -MP -MF $(DEPDIR)/Sap_Emu.Tpo -c -o Sap_Emu.lo `test -f '$(gmeversion)/gme/Sap_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Emu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sap_Emu.Tpo $(DEPDIR)/Sap_Emu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sap_Emu.cpp' object='Sap_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Emu.lo `test -f '$(gmeversion)/gme/Sap_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Emu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Emu.lo `test -f '$(gmeversion)/gme/Sap_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Emu.cpp
 
 Sgc_Core.lo: $(gmeversion)/gme/Sgc_Core.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Core.lo -MD -MP -MF $(DEPDIR)/Sgc_Core.Tpo -c -o Sgc_Core.lo `test -f '$(gmeversion)/gme/Sgc_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Core.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Sgc_Core.Tpo $(DEPDIR)/Sgc_Core.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Sgc_Core.cpp' object='Sgc_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Core.lo -MD -MP -MF $(DEPDIR)/Sgc_Core.Tpo -c -o Sgc_Core.lo `test -f '$(gmeversion)/gme/Sgc_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Core.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sgc_Core.Tpo $(DEPDIR)/Sgc_Core.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sgc_Core.cpp' object='Sgc_Core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Core.lo `test -f '$(gmeversion)/gme/Sgc_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Core.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Core.lo `test -f '$(gmeversion)/gme/Sgc_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Core.cpp
 
 Sgc_Cpu.lo: $(gmeversion)/gme/Sgc_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Cpu.lo -MD -MP -MF $(DEPDIR)/Sgc_Cpu.Tpo -c -o Sgc_Cpu.lo `test -f '$(gmeversion)/gme/Sgc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Sgc_Cpu.Tpo $(DEPDIR)/Sgc_Cpu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Sgc_Cpu.cpp' object='Sgc_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Cpu.lo -MD -MP -MF $(DEPDIR)/Sgc_Cpu.Tpo -c -o Sgc_Cpu.lo `test -f '$(gmeversion)/gme/Sgc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Cpu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sgc_Cpu.Tpo $(DEPDIR)/Sgc_Cpu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sgc_Cpu.cpp' object='Sgc_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Cpu.lo `test -f '$(gmeversion)/gme/Sgc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Cpu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Cpu.lo `test -f '$(gmeversion)/gme/Sgc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Cpu.cpp
 
 Sgc_Emu.lo: $(gmeversion)/gme/Sgc_Emu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Emu.lo -MD -MP -MF $(DEPDIR)/Sgc_Emu.Tpo -c -o Sgc_Emu.lo `test -f '$(gmeversion)/gme/Sgc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Emu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Sgc_Emu.Tpo $(DEPDIR)/Sgc_Emu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Sgc_Emu.cpp' object='Sgc_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Emu.lo -MD -MP -MF $(DEPDIR)/Sgc_Emu.Tpo -c -o Sgc_Emu.lo `test -f '$(gmeversion)/gme/Sgc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Emu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sgc_Emu.Tpo $(DEPDIR)/Sgc_Emu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sgc_Emu.cpp' object='Sgc_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Emu.lo `test -f '$(gmeversion)/gme/Sgc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Emu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Emu.lo `test -f '$(gmeversion)/gme/Sgc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Emu.cpp
 
 Sgc_Impl.lo: $(gmeversion)/gme/Sgc_Impl.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Impl.lo -MD -MP -MF $(DEPDIR)/Sgc_Impl.Tpo -c -o Sgc_Impl.lo `test -f '$(gmeversion)/gme/Sgc_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Impl.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Sgc_Impl.Tpo $(DEPDIR)/Sgc_Impl.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Sgc_Impl.cpp' object='Sgc_Impl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Impl.lo -MD -MP -MF $(DEPDIR)/Sgc_Impl.Tpo -c -o Sgc_Impl.lo `test -f '$(gmeversion)/gme/Sgc_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Impl.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sgc_Impl.Tpo $(DEPDIR)/Sgc_Impl.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sgc_Impl.cpp' object='Sgc_Impl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Impl.lo `test -f '$(gmeversion)/gme/Sgc_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Impl.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Impl.lo `test -f '$(gmeversion)/gme/Sgc_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Impl.cpp
 
 Sms_Apu.lo: $(gmeversion)/gme/Sms_Apu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sms_Apu.lo -MD -MP -MF $(DEPDIR)/Sms_Apu.Tpo -c -o Sms_Apu.lo `test -f '$(gmeversion)/gme/Sms_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Apu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Sms_Apu.Tpo $(DEPDIR)/Sms_Apu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Sms_Apu.cpp' object='Sms_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sms_Apu.lo -MD -MP -MF $(DEPDIR)/Sms_Apu.Tpo -c -o Sms_Apu.lo `test -f '$(gmeversion)/gme/Sms_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Apu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sms_Apu.Tpo $(DEPDIR)/Sms_Apu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sms_Apu.cpp' object='Sms_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sms_Apu.lo `test -f '$(gmeversion)/gme/Sms_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Apu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sms_Apu.lo `test -f '$(gmeversion)/gme/Sms_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Apu.cpp
 
 Sms_Fm_Apu.lo: $(gmeversion)/gme/Sms_Fm_Apu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sms_Fm_Apu.lo -MD -MP -MF $(DEPDIR)/Sms_Fm_Apu.Tpo -c -o Sms_Fm_Apu.lo `test -f '$(gmeversion)/gme/Sms_Fm_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Fm_Apu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Sms_Fm_Apu.Tpo $(DEPDIR)/Sms_Fm_Apu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Sms_Fm_Apu.cpp' object='Sms_Fm_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sms_Fm_Apu.lo -MD -MP -MF $(DEPDIR)/Sms_Fm_Apu.Tpo -c -o Sms_Fm_Apu.lo `test -f '$(gmeversion)/gme/Sms_Fm_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Fm_Apu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sms_Fm_Apu.Tpo $(DEPDIR)/Sms_Fm_Apu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sms_Fm_Apu.cpp' object='Sms_Fm_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sms_Fm_Apu.lo `test -f '$(gmeversion)/gme/Sms_Fm_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Fm_Apu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sms_Fm_Apu.lo `test -f '$(gmeversion)/gme/Sms_Fm_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Fm_Apu.cpp
 
 Snes_Spc.lo: $(gmeversion)/gme/Snes_Spc.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Snes_Spc.lo -MD -MP -MF $(DEPDIR)/Snes_Spc.Tpo -c -o Snes_Spc.lo `test -f '$(gmeversion)/gme/Snes_Spc.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Snes_Spc.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Snes_Spc.Tpo $(DEPDIR)/Snes_Spc.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Snes_Spc.cpp' object='Snes_Spc.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Snes_Spc.lo -MD -MP -MF $(DEPDIR)/Snes_Spc.Tpo -c -o Snes_Spc.lo `test -f '$(gmeversion)/gme/Snes_Spc.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Snes_Spc.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Snes_Spc.Tpo $(DEPDIR)/Snes_Spc.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Snes_Spc.cpp' object='Snes_Spc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Snes_Spc.lo `test -f '$(gmeversion)/gme/Snes_Spc.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Snes_Spc.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Snes_Spc.lo `test -f '$(gmeversion)/gme/Snes_Spc.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Snes_Spc.cpp
 
 Spc_Cpu.lo: $(gmeversion)/gme/Spc_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Cpu.lo -MD -MP -MF $(DEPDIR)/Spc_Cpu.Tpo -c -o Spc_Cpu.lo `test -f '$(gmeversion)/gme/Spc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Spc_Cpu.Tpo $(DEPDIR)/Spc_Cpu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Spc_Cpu.cpp' object='Spc_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Cpu.lo -MD -MP -MF $(DEPDIR)/Spc_Cpu.Tpo -c -o Spc_Cpu.lo `test -f '$(gmeversion)/gme/Spc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Cpu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Spc_Cpu.Tpo $(DEPDIR)/Spc_Cpu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Spc_Cpu.cpp' object='Spc_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Cpu.lo `test -f '$(gmeversion)/gme/Spc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Cpu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Cpu.lo `test -f '$(gmeversion)/gme/Spc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Cpu.cpp
 
 Spc_Dsp.lo: $(gmeversion)/gme/Spc_Dsp.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Dsp.lo -MD -MP -MF $(DEPDIR)/Spc_Dsp.Tpo -c -o Spc_Dsp.lo `test -f '$(gmeversion)/gme/Spc_Dsp.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Dsp.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Spc_Dsp.Tpo $(DEPDIR)/Spc_Dsp.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Spc_Dsp.cpp' object='Spc_Dsp.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Dsp.lo -MD -MP -MF $(DEPDIR)/Spc_Dsp.Tpo -c -o Spc_Dsp.lo `test -f '$(gmeversion)/gme/Spc_Dsp.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Dsp.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Spc_Dsp.Tpo $(DEPDIR)/Spc_Dsp.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Spc_Dsp.cpp' object='Spc_Dsp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Dsp.lo `test -f '$(gmeversion)/gme/Spc_Dsp.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Dsp.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Dsp.lo `test -f '$(gmeversion)/gme/Spc_Dsp.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Dsp.cpp
 
 Spc_Emu.lo: $(gmeversion)/gme/Spc_Emu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Emu.lo -MD -MP -MF $(DEPDIR)/Spc_Emu.Tpo -c -o Spc_Emu.lo `test -f '$(gmeversion)/gme/Spc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Emu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Spc_Emu.Tpo $(DEPDIR)/Spc_Emu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Spc_Emu.cpp' object='Spc_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Emu.lo -MD -MP -MF $(DEPDIR)/Spc_Emu.Tpo -c -o Spc_Emu.lo `test -f '$(gmeversion)/gme/Spc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Emu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Spc_Emu.Tpo $(DEPDIR)/Spc_Emu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Spc_Emu.cpp' object='Spc_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Emu.lo `test -f '$(gmeversion)/gme/Spc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Emu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Emu.lo `test -f '$(gmeversion)/gme/Spc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Emu.cpp
 
 SPC_Filter.lo: $(gmeversion)/gme/SPC_Filter.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SPC_Filter.lo -MD -MP -MF $(DEPDIR)/SPC_Filter.Tpo -c -o SPC_Filter.lo `test -f '$(gmeversion)/gme/SPC_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/SPC_Filter.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/SPC_Filter.Tpo $(DEPDIR)/SPC_Filter.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/SPC_Filter.cpp' object='SPC_Filter.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SPC_Filter.lo -MD -MP -MF $(DEPDIR)/SPC_Filter.Tpo -c -o SPC_Filter.lo `test -f '$(gmeversion)/gme/SPC_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/SPC_Filter.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SPC_Filter.Tpo $(DEPDIR)/SPC_Filter.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/SPC_Filter.cpp' object='SPC_Filter.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SPC_Filter.lo `test -f '$(gmeversion)/gme/SPC_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/SPC_Filter.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SPC_Filter.lo `test -f '$(gmeversion)/gme/SPC_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/SPC_Filter.cpp
 
 Track_Filter.lo: $(gmeversion)/gme/Track_Filter.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Track_Filter.lo -MD -MP -MF $(DEPDIR)/Track_Filter.Tpo -c -o Track_Filter.lo `test -f '$(gmeversion)/gme/Track_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Track_Filter.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Track_Filter.Tpo $(DEPDIR)/Track_Filter.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Track_Filter.cpp' object='Track_Filter.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Track_Filter.lo -MD -MP -MF $(DEPDIR)/Track_Filter.Tpo -c -o Track_Filter.lo `test -f '$(gmeversion)/gme/Track_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Track_Filter.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Track_Filter.Tpo $(DEPDIR)/Track_Filter.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Track_Filter.cpp' object='Track_Filter.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Track_Filter.lo `test -f '$(gmeversion)/gme/Track_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Track_Filter.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Track_Filter.lo `test -f '$(gmeversion)/gme/Track_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Track_Filter.cpp
 
 Upsampler.lo: $(gmeversion)/gme/Upsampler.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Upsampler.lo -MD -MP -MF $(DEPDIR)/Upsampler.Tpo -c -o Upsampler.lo `test -f '$(gmeversion)/gme/Upsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Upsampler.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Upsampler.Tpo $(DEPDIR)/Upsampler.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Upsampler.cpp' object='Upsampler.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Upsampler.lo -MD -MP -MF $(DEPDIR)/Upsampler.Tpo -c -o Upsampler.lo `test -f '$(gmeversion)/gme/Upsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Upsampler.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Upsampler.Tpo $(DEPDIR)/Upsampler.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Upsampler.cpp' object='Upsampler.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Upsampler.lo `test -f '$(gmeversion)/gme/Upsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Upsampler.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Upsampler.lo `test -f '$(gmeversion)/gme/Upsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Upsampler.cpp
 
 Vgm_Core.lo: $(gmeversion)/gme/Vgm_Core.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Vgm_Core.lo -MD -MP -MF $(DEPDIR)/Vgm_Core.Tpo -c -o Vgm_Core.lo `test -f '$(gmeversion)/gme/Vgm_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Core.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Vgm_Core.Tpo $(DEPDIR)/Vgm_Core.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Vgm_Core.cpp' object='Vgm_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Vgm_Core.lo -MD -MP -MF $(DEPDIR)/Vgm_Core.Tpo -c -o Vgm_Core.lo `test -f '$(gmeversion)/gme/Vgm_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Core.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Vgm_Core.Tpo $(DEPDIR)/Vgm_Core.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Vgm_Core.cpp' object='Vgm_Core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Vgm_Core.lo `test -f '$(gmeversion)/gme/Vgm_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Core.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Vgm_Core.lo `test -f '$(gmeversion)/gme/Vgm_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Core.cpp
 
 Vgm_Emu.lo: $(gmeversion)/gme/Vgm_Emu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Vgm_Emu.lo -MD -MP -MF $(DEPDIR)/Vgm_Emu.Tpo -c -o Vgm_Emu.lo `test -f '$(gmeversion)/gme/Vgm_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Emu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Vgm_Emu.Tpo $(DEPDIR)/Vgm_Emu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Vgm_Emu.cpp' object='Vgm_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Vgm_Emu.lo -MD -MP -MF $(DEPDIR)/Vgm_Emu.Tpo -c -o Vgm_Emu.lo `test -f '$(gmeversion)/gme/Vgm_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Emu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Vgm_Emu.Tpo $(DEPDIR)/Vgm_Emu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Vgm_Emu.cpp' object='Vgm_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Vgm_Emu.lo `test -f '$(gmeversion)/gme/Vgm_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Emu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Vgm_Emu.lo `test -f '$(gmeversion)/gme/Vgm_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Emu.cpp
 
 Ym2413_Emu.lo: $(gmeversion)/gme/Ym2413_Emu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ym2413_Emu.lo -MD -MP -MF $(DEPDIR)/Ym2413_Emu.Tpo -c -o Ym2413_Emu.lo `test -f '$(gmeversion)/gme/Ym2413_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2413_Emu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Ym2413_Emu.Tpo $(DEPDIR)/Ym2413_Emu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Ym2413_Emu.cpp' object='Ym2413_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ym2413_Emu.lo -MD -MP -MF $(DEPDIR)/Ym2413_Emu.Tpo -c -o Ym2413_Emu.lo `test -f '$(gmeversion)/gme/Ym2413_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2413_Emu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Ym2413_Emu.Tpo $(DEPDIR)/Ym2413_Emu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Ym2413_Emu.cpp' object='Ym2413_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ym2413_Emu.lo `test -f '$(gmeversion)/gme/Ym2413_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2413_Emu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ym2413_Emu.lo `test -f '$(gmeversion)/gme/Ym2413_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2413_Emu.cpp
 
 Ym2612_Emu.lo: $(gmeversion)/gme/Ym2612_Emu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ym2612_Emu.lo -MD -MP -MF $(DEPDIR)/Ym2612_Emu.Tpo -c -o Ym2612_Emu.lo `test -f '$(gmeversion)/gme/Ym2612_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2612_Emu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Ym2612_Emu.Tpo $(DEPDIR)/Ym2612_Emu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Ym2612_Emu.cpp' object='Ym2612_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ym2612_Emu.lo -MD -MP -MF $(DEPDIR)/Ym2612_Emu.Tpo -c -o Ym2612_Emu.lo `test -f '$(gmeversion)/gme/Ym2612_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2612_Emu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Ym2612_Emu.Tpo $(DEPDIR)/Ym2612_Emu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Ym2612_Emu.cpp' object='Ym2612_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ym2612_Emu.lo `test -f '$(gmeversion)/gme/Ym2612_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2612_Emu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ym2612_Emu.lo `test -f '$(gmeversion)/gme/Ym2612_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2612_Emu.cpp
 
 ymdeltat.lo: $(gmeversion)/gme/ymdeltat.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ymdeltat.lo -MD -MP -MF $(DEPDIR)/ymdeltat.Tpo -c -o ymdeltat.lo `test -f '$(gmeversion)/gme/ymdeltat.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/ymdeltat.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/ymdeltat.Tpo $(DEPDIR)/ymdeltat.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/ymdeltat.cpp' object='ymdeltat.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ymdeltat.lo -MD -MP -MF $(DEPDIR)/ymdeltat.Tpo -c -o ymdeltat.lo `test -f '$(gmeversion)/gme/ymdeltat.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/ymdeltat.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ymdeltat.Tpo $(DEPDIR)/ymdeltat.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/ymdeltat.cpp' object='ymdeltat.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ymdeltat.lo `test -f '$(gmeversion)/gme/ymdeltat.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/ymdeltat.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ymdeltat.lo `test -f '$(gmeversion)/gme/ymdeltat.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/ymdeltat.cpp
 
 Z80_Cpu.lo: $(gmeversion)/gme/Z80_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Z80_Cpu.lo -MD -MP -MF $(DEPDIR)/Z80_Cpu.Tpo -c -o Z80_Cpu.lo `test -f '$(gmeversion)/gme/Z80_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Z80_Cpu.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Z80_Cpu.Tpo $(DEPDIR)/Z80_Cpu.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Z80_Cpu.cpp' object='Z80_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Z80_Cpu.lo -MD -MP -MF $(DEPDIR)/Z80_Cpu.Tpo -c -o Z80_Cpu.lo `test -f '$(gmeversion)/gme/Z80_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Z80_Cpu.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Z80_Cpu.Tpo $(DEPDIR)/Z80_Cpu.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Z80_Cpu.cpp' object='Z80_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Z80_Cpu.lo `test -f '$(gmeversion)/gme/Z80_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Z80_Cpu.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Z80_Cpu.lo `test -f '$(gmeversion)/gme/Z80_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Z80_Cpu.cpp
 
 Data_Reader.lo: $(gmeversion)/gme/Data_Reader.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Data_Reader.lo -MD -MP -MF $(DEPDIR)/Data_Reader.Tpo -c -o Data_Reader.lo `test -f '$(gmeversion)/gme/Data_Reader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Data_Reader.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Data_Reader.Tpo $(DEPDIR)/Data_Reader.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Data_Reader.cpp' object='Data_Reader.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Data_Reader.lo -MD -MP -MF $(DEPDIR)/Data_Reader.Tpo -c -o Data_Reader.lo `test -f '$(gmeversion)/gme/Data_Reader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Data_Reader.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Data_Reader.Tpo $(DEPDIR)/Data_Reader.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Data_Reader.cpp' object='Data_Reader.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Data_Reader.lo `test -f '$(gmeversion)/gme/Data_Reader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Data_Reader.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Data_Reader.lo `test -f '$(gmeversion)/gme/Data_Reader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Data_Reader.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1692,26 +1573,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1723,15 +1593,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1740,6 +1606,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1884,19 +1765,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/gme/cgme.c b/plugins/gme/cgme.c
index e04d1bf..d172664 100644
--- a/plugins/gme/cgme.c
+++ b/plugins/gme/cgme.c
@@ -1,53 +1,61 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    GameMusicEmu plugin for DeaDBeeF
+    Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 2 of the License, or
-    (at your option) any later version.
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
 
-    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.
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
+
+#ifdef HAVE_CONFIG_H
+#  include "../../config.h"
+#endif
 #include <stdio.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include "gme/gme.h"
 #include <zlib.h>
 #include "../../deadbeef.h"
-
-int _Unwind_Resume_or_Rethrow;
-int _Unwind_RaiseException;
-int _Unwind_GetLanguageSpecificData;
-int _Unwind_Resume;
-int _Unwind_DeleteException;
-int _Unwind_GetTextRelBase;
-int _Unwind_SetIP;
-int _Unwind_GetDataRelBase;
-int _Unwind_GetRegionStart;
-int _Unwind_SetGR;
-int _Unwind_GetIPInfo;
+#if HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h>
+#endif
+#if HAVE_SYS_SYSLIMITS_H
+#include <sys/syslimits.h>
+#endif
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
+// how big vgz can be?
+#define MAX_REMOTE_GZ_FILE 0x100000
+
 static DB_decoder_t plugin;
 static DB_functions_t *deadbeef;
 static int conf_fadeout = 10;
 static int conf_loopcount = 2;
+static int chip_voices = 0xff;
+static int chip_voices_changed = 0;
 
 typedef struct {
     DB_fileinfo_t info;
     Music_Emu *emu;
     int reallength;
-    uint32_t cgme_voicemask;
     float duration; // of current song
 } gme_fileinfo_t;
 
@@ -60,14 +68,43 @@ cgme_open (uint32_t hint) {
 
 static int
 read_gzfile (const char *fname, char **buffer, int *size) {
-    FILE *fp = fopen (fname, "rb");
+    int fd = -1;
+    DB_FILE *fp = deadbeef->fopen (fname);
     if (!fp) {
-        trace ("failed to fopen %s\n", fname);
+        trace ("gme read_gzfile: failed to fopen %s\n", fname);
         return -1;
     }
-    fseek (fp, 0, SEEK_END);
-    size_t sz = ftell (fp);
-    fclose (fp);
+
+    int64_t sz = deadbeef->fgetlength (fp);
+    if (fp->vfs && fp->vfs->plugin.id && strcmp (fp->vfs->plugin.id, "vfs_stdio") && sz > 0 && sz <= MAX_REMOTE_GZ_FILE) {
+        trace ("gme read_gzfile: reading %s of size %lld and writing to temp file\n", fname, sz);
+        char buffer[sz];
+        if (sz == deadbeef->fread (buffer, 1, sz, fp)) {
+            const char *tmp = getenv ("TMPDIR");
+            if (!tmp) {
+                tmp = "/tmp";
+            }
+            char nm[PATH_MAX];
+#if defined(ANDROID) || defined(STATICLINK)
+            snprintf (nm, sizeof (nm), "%s/ddbgmeXXXXXX", tmp);
+            fd = mkstemp (nm);
+#else
+            snprintf (nm, sizeof (nm), "%s/ddbgmeXXXXXX.vgz", tmp);
+            fd = mkstemps (nm, 4);
+#endif
+            if (fd == -1 || sz != write (fd, buffer, sz)) {
+                trace ("gme read_gzfile: failed to write temp file\n");
+                if (fd != -1) {
+                    close (fd);
+                }
+            }
+            if (fd != -1) {
+                lseek (fd, 0, SEEK_SET);
+            }
+        }
+    }
+
+    deadbeef->fclose (fp);
 
     sz *= 2;
     int readsize = sz;
@@ -76,7 +113,7 @@ read_gzfile (const char *fname, char **buffer, int *size) {
         return -1;
     }
 
-    gzFile gz = gzopen (fname, "rb");
+    gzFile gz = fd == -1 ? gzopen (fname, "rb") : gzdopen (fd, "r");
     if (!gz) {
         trace ("failed to gzopen %s\n", fname);
         return -1;
@@ -89,6 +126,7 @@ read_gzfile (const char *fname, char **buffer, int *size) {
         if (nb < 0) {
             free (*buffer);
             trace ("failed to gzread from %s\n", fname);
+            gzclose (gz);
             return -1;
         }
         if (nb > 0) {
@@ -162,7 +200,8 @@ cgme_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
         trace ("failed with error %d\n", res);
         return -1;
     }
-    gme_mute_voices (info->emu, info->cgme_voicemask);
+    chip_voices = deadbeef->conf_get_int ("chip.voices", 0xff);
+    gme_mute_voices (info->emu, chip_voices^0xff);
     gme_start_track (info->emu, deadbeef->pl_find_meta_int (it, ":TRACKNUM", 0));
 
 #ifdef GME_VERSION_055
@@ -206,6 +245,13 @@ cgme_read (DB_fileinfo_t *_info, char *bytes, int size) {
         // DON'T ajust size, buffer must always be po2
         //size = t * (float)info->samplerate * 4;
     }
+
+    if (chip_voices_changed) {
+        chip_voices = deadbeef->conf_get_int ("chip.voices", 0xff);
+        chip_voices_changed = 0;
+        gme_mute_voices (info->emu, chip_voices^0xff);
+    }
+
     if (gme_play (info->emu, size/2, (short*)bytes)) {
         return 0;
     }
@@ -418,25 +464,6 @@ static const char * exts[]=
 	"ay","gbs","gym","hes","kss","nsf","nsfe","sap","spc","vgm","vgz",NULL
 };
 
-#if 0
-static int
-cgme_numvoices (void) {
-    if (!emu) {
-        return 0;
-    }
-    return gme_voice_count (emu);
-}
-
-static void
-cgme_mutevoice (int voice, int mute) {
-    cgme_voicemask &= ~ (1<<voice);
-    cgme_voicemask |= ((mute ? 1 : 0) << voice);
-    if (emu) {
-        gme_mute_voices (emu, cgme_voicemask);
-    }
-}
-#endif
-
 static int
 cgme_start (void) {
     conf_fadeout = deadbeef->conf_get_int ("gme.fadeout", 10);
@@ -455,6 +482,9 @@ cgme_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
     case DB_EV_CONFIGCHANGED:
         conf_fadeout = deadbeef->conf_get_int ("gme.fadeout", 10);
         conf_loopcount = deadbeef->conf_get_int ("gme.loopcount", 2);
+        if (chip_voices != deadbeef->conf_get_int ("chip.voices", 0xff)) {
+            chip_voices_changed = 1;
+        }
         break;
     }
     return 0;
diff --git a/plugins/gme/game-music-emu-0.6pre/gme/Sap_Apu.cpp b/plugins/gme/game-music-emu-0.6pre/gme/Sap_Apu.cpp
index 23633dc..d828c28 100644
--- a/plugins/gme/game-music-emu-0.6pre/gme/Sap_Apu.cpp
+++ b/plugins/gme/game-music-emu-0.6pre/gme/Sap_Apu.cpp
@@ -93,7 +93,8 @@ void Sap_Apu::reset( Sap_Apu_Impl* new_impl )
 		memset( &oscs [i], 0, offsetof (osc_t,output) );
 }
 
-inline void Sap_Apu::calc_periods()
+static byte fast_bits [Sap_Apu::osc_count] = { 1 << 6, 1 << 4, 1 << 5, 1 << 3 };
+void Sap_Apu::calc_periods()
 {
 	 // 15/64 kHz clock
 	int divider = 28;
@@ -106,7 +107,6 @@ inline void Sap_Apu::calc_periods()
 		
 		int const osc_reload = osc->regs [0]; // cache
 		int period = (osc_reload + 1) * divider;
-		static byte const fast_bits [osc_count] = { 1 << 6, 1 << 4, 1 << 5, 1 << 3 };
 		if ( this->control & fast_bits [i] )
 		{
 			period = osc_reload + 4;
diff --git a/plugins/gtkui/COPYING b/plugins/gtkui/COPYING
new file mode 100644
index 0000000..5e62520
--- /dev/null
+++ b/plugins/gtkui/COPYING
@@ -0,0 +1,16 @@
+GTK2/3 UI plugin for DeaDBeeF player
+Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am
index f6c30c7..8495bd5 100644
--- a/plugins/gtkui/Makefile.am
+++ b/plugins/gtkui/Makefile.am
@@ -13,9 +13,9 @@ gtkuidir = $(libdir)/$(PACKAGE)
 #endif
 #endif
 
-#if OS_OSX
-#OSXSRC = retina.m
-#endif
+if OS_OSX
+osx_sources = retina.m
+endif
 
 GTKUI_SOURCES =    gtkui.c gtkui.h\
 				   callbacks.c interface.c support.c callbacks.h interface.h support.h\
@@ -54,8 +54,8 @@ sdk_HEADERS = gtkui_api.h
 
 EXTRA_DIST = deadbeef.glade
 
-GTKGLEXT2_LIBS = -lGL -lGLU
-GTKGLEXT3_LIBS =
+#GTKGLEXT2_LIBS =
+#GTKGLEXT3_LIBS =
 
 if STATICLINK
 if HAVE_GTK2
@@ -149,27 +149,19 @@ GTKUI_SOURCES_GTK2 = $(GTKUI_SOURCES)
 #	gtkglext-gtk2/gdk/glext/glxext-extra.h\
 #	gtkglext-gtk2/gdk/glext/glxext.h
 
-GTKGLEXT_CFLAGS_GTK2 = -I at top_srcdir@/plugins/gtkui/gtkglext-gtk2 -I at top_srcdir@/plugins/gtkui/gtkglext-gtk2/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
+#GTKGLEXT_CFLAGS_GTK2 = -I at top_srcdir@/plugins/gtkui/gtkglext-gtk2 -I at top_srcdir@/plugins/gtkui/gtkglext-gtk2/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
 
 ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES_GTK2)
-ddb_gui_GTK2_la_LDFLAGS = -module
-
-if STATICLINK
-GTK_ROOT_216=@top_srcdir@/$(LIB)/gtk-2.16.0
+ddb_gui_GTK2_la_LDFLAGS = -module -avoid-version
 
-ddb_gui_GTK2_la_LIBADD = $(LDADD) -L$(GTK_ROOT_216)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS)
-
-ddb_gui_GTK2_la_CFLAGS = -std=c99 -I$(GTK_ROOT_216)/include/gtk-2.0 -I$(GTK_ROOT_216)/lib/gtk-2.0/include -I$(GTK_ROOT_216)/include/atk-1.0 -I$(GTK_ROOT_216)/include/cairo -I$(GTK_ROOT_216)/include/pango-1.0 -I$(GTK_ROOT_216)/include -I$(GTK_ROOT_216)/include/glib-2.0 -I$(GTK_ROOT_216)/lib/glib-2.0/include $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2)
-else
 ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a  $(GTKGLEXT2_LIBS)
 
 ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2) -DDDB_WARN_DEPRECATED=1
-endif
 
 endif
 
 if HAVE_GTK3
-GTKUI_SOURCES_GTK3 = $(GTKUI_SOURCES)
+GTKUI_SOURCES_GTK3 = $(GTKUI_SOURCES) $(osx_sources)
 
 #	gtkglext-gtk3/gtk/gtkglinit.c\
 #	gtkglext-gtk3/gtk/gtkglversion.c\
@@ -231,32 +223,23 @@ GTKUI_SOURCES_GTK3 = $(GTKUI_SOURCES)
 
 GTKGLEXT_CFLAGS_GTK3 = -I at top_srcdir@/plugins/gtkui/gtkglext-gtk3 -I at top_srcdir@/plugins/gtkui/gtkglext-gtk3/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
 
-ddb_gui_GTK3_la_LDFLAGS = -module
+ddb_gui_GTK3_la_LDFLAGS = -module -avoid-version
 
-if STATICLINK
-ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
-GTK_ROOT_300=@top_srcdir@/$(LIB)/gtk-3.0.0
-
-ddb_gui_GTK3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT3_LIBS)
-
-ddb_gui_GTK3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
-else
 ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
 ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT3_LIBS)
 ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
 ddb_gui_GTK3_la_OBJCFLAGS = $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
 
 endif
-endif
 
 # fallback lib
 if STATICLINK
 GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr
 
 ddb_gui_GTK2_fallback_la_SOURCES = $(GTKUI_SOURCES_GTK2)
-ddb_gui_GTK2_fallback_la_LDFLAGS = -module
+ddb_gui_GTK2_fallback_la_LDFLAGS = -module -avoid-version
 
-ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS)
+ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lgthread-2.0 -lrt -lglib-2.0 $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS)
 
 ddb_gui_GTK2_fallback_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2)
 
diff --git a/plugins/gtkui/Makefile.in b/plugins/gtkui/Makefile.in
index 50ada7b..5043800 100644
--- a/plugins/gtkui/Makefile.in
+++ b/plugins/gtkui/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,23 +16,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,8 +80,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/gtkui
-DIST_COMMON = $(sdk_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(sdk_HEADERS) COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -111,21 +138,8 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sdkdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
 @STATICLINK_TRUE at ddb_gui_GTK2_fallback_la_DEPENDENCIES =  \
- at STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgtk-x11-2.0.la \
- at STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgdk-x11-2.0.la \
- at STATICLINK_TRUE@	$(GTK_ROOT)/lib/libpangoft2-1.0.la \
- at STATICLINK_TRUE@	$(GTK_ROOT)/lib/libpangocairo-1.0.la \
- at STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la \
- at STATICLINK_TRUE@	$(GTK_ROOT)/lib/libcairo.la \
- at STATICLINK_TRUE@	$(GTK_ROOT)/lib/libpango-1.0.la \
- at STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgobject-2.0.la \
- at STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgmodule-2.0.la \
- at STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgthread-2.0.la \
- at STATICLINK_TRUE@	$(GTK_ROOT)/lib/libglib-2.0.la \
- at STATICLINK_TRUE@	../libparser/libparser.a \
- at STATICLINK_TRUE@	$(am__DEPENDENCIES_1)
+ at STATICLINK_TRUE@	../libparser/libparser.a
 am__ddb_gui_GTK2_fallback_la_SOURCES_DIST = gtkui.c gtkui.h \
 	callbacks.c interface.c support.c callbacks.h interface.h \
 	support.h ddblistview.c ddblistview.h mainplaylist.c \
@@ -178,8 +192,12 @@ am__objects_1 = ddb_gui_GTK2_fallback_la-gtkui.lo \
 @STATICLINK_TRUE@	$(am__objects_2)
 ddb_gui_GTK2_fallback_la_OBJECTS =  \
 	$(am_ddb_gui_GTK2_fallback_la_OBJECTS)
-ddb_gui_GTK2_fallback_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+ddb_gui_GTK2_fallback_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) \
 	$(ddb_gui_GTK2_fallback_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_TRUE at am_ddb_gui_GTK2_fallback_la_rpath =  \
@@ -188,13 +206,9 @@ ddb_gui_GTK2_fallback_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at am_ddb_gui_GTK2_fallback_la_rpath =  \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@	-rpath \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@	$(pkglibdir)
- at HAVE_GTK2_TRUE@@STATICLINK_FALSE at ddb_gui_GTK2_la_DEPENDENCIES =  \
- at HAVE_GTK2_TRUE@@STATICLINK_FALSE@	$(am__DEPENDENCIES_1) \
- at HAVE_GTK2_TRUE@@STATICLINK_FALSE@	../libparser/libparser.a \
- at HAVE_GTK2_TRUE@@STATICLINK_FALSE@	$(am__DEPENDENCIES_1)
- at HAVE_GTK2_TRUE@@STATICLINK_TRUE at ddb_gui_GTK2_la_DEPENDENCIES =  \
- at HAVE_GTK2_TRUE@@STATICLINK_TRUE@	../libparser/libparser.a \
- at HAVE_GTK2_TRUE@@STATICLINK_TRUE@	$(am__DEPENDENCIES_1)
+am__DEPENDENCIES_1 =
+ at HAVE_GTK2_TRUE@ddb_gui_GTK2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ at HAVE_GTK2_TRUE@	../libparser/libparser.a
 am__ddb_gui_GTK2_la_SOURCES_DIST = gtkui.c gtkui.h callbacks.c \
 	interface.c support.c callbacks.h interface.h support.h \
 	ddblistview.c ddblistview.h mainplaylist.c mainplaylist.h \
@@ -230,9 +244,10 @@ am__objects_3 = ddb_gui_GTK2_la-gtkui.lo ddb_gui_GTK2_la-callbacks.lo \
 @HAVE_GTK2_TRUE at am__objects_4 = $(am__objects_3)
 @HAVE_GTK2_TRUE at am_ddb_gui_GTK2_la_OBJECTS = $(am__objects_4)
 ddb_gui_GTK2_la_OBJECTS = $(am_ddb_gui_GTK2_la_OBJECTS)
-ddb_gui_GTK2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ddb_gui_GTK2_la_CFLAGS) \
-	$(CFLAGS) $(ddb_gui_GTK2_la_LDFLAGS) $(LDFLAGS) -o $@
+ddb_gui_GTK2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) $(ddb_gui_GTK2_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
 @HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_FALSE at am_ddb_gui_GTK2_la_rpath =  \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_FALSE@	-rpath \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_FALSE@	$(pkglibdir)
@@ -245,13 +260,8 @@ ddb_gui_GTK2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at am_ddb_gui_GTK2_la_rpath =  \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@	-rpath \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@	$(pkglibdir)
- at HAVE_GTK3_TRUE@@STATICLINK_FALSE at ddb_gui_GTK3_la_DEPENDENCIES =  \
- at HAVE_GTK3_TRUE@@STATICLINK_FALSE@	$(am__DEPENDENCIES_1) \
- at HAVE_GTK3_TRUE@@STATICLINK_FALSE@	../libparser/libparser.a \
- at HAVE_GTK3_TRUE@@STATICLINK_FALSE@	$(am__DEPENDENCIES_1)
- at HAVE_GTK3_TRUE@@STATICLINK_TRUE at ddb_gui_GTK3_la_DEPENDENCIES =  \
- at HAVE_GTK3_TRUE@@STATICLINK_TRUE@	../libparser/libparser.a \
- at HAVE_GTK3_TRUE@@STATICLINK_TRUE@	$(am__DEPENDENCIES_1)
+ at HAVE_GTK3_TRUE@ddb_gui_GTK3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ at HAVE_GTK3_TRUE@	../libparser/libparser.a
 am__ddb_gui_GTK3_la_SOURCES_DIST = gtkui.c gtkui.h callbacks.c \
 	interface.c support.c callbacks.h interface.h support.h \
 	ddblistview.c ddblistview.h mainplaylist.c mainplaylist.h \
@@ -265,7 +275,7 @@ am__ddb_gui_GTK3_la_SOURCES_DIST = gtkui.c gtkui.h callbacks.c \
 	ddbcellrenderertextmultiline.h ddbseekbar.c ddbequalizer.c \
 	ddbcellrenderertextmultiline.c gtkuigl.c gtkuigl.h hotkeys.c \
 	hotkeys.h actionhandlers.c actionhandlers.h pltmenu.c \
-	ctmapping.c ctmapping.h namedicons.c namedicons.h
+	ctmapping.c ctmapping.h namedicons.c namedicons.h retina.m
 am__objects_5 = ddb_gui_GTK3_la-gtkui.lo ddb_gui_GTK3_la-callbacks.lo \
 	ddb_gui_GTK3_la-interface.lo ddb_gui_GTK3_la-support.lo \
 	ddb_gui_GTK3_la-ddblistview.lo ddb_gui_GTK3_la-mainplaylist.lo \
@@ -284,15 +294,14 @@ am__objects_5 = ddb_gui_GTK3_la-gtkui.lo ddb_gui_GTK3_la-callbacks.lo \
 	ddb_gui_GTK3_la-gtkuigl.lo ddb_gui_GTK3_la-hotkeys.lo \
 	ddb_gui_GTK3_la-actionhandlers.lo ddb_gui_GTK3_la-pltmenu.lo \
 	ddb_gui_GTK3_la-ctmapping.lo ddb_gui_GTK3_la-namedicons.lo
- at HAVE_GTK3_TRUE@am__objects_6 = $(am__objects_5)
- at HAVE_GTK3_TRUE@@STATICLINK_FALSE at am_ddb_gui_GTK3_la_OBJECTS =  \
- at HAVE_GTK3_TRUE@@STATICLINK_FALSE@	$(am__objects_6)
- at HAVE_GTK3_TRUE@@STATICLINK_TRUE at am_ddb_gui_GTK3_la_OBJECTS =  \
- at HAVE_GTK3_TRUE@@STATICLINK_TRUE@	$(am__objects_6)
+ at OS_OSX_TRUE@am__objects_6 = ddb_gui_GTK3_la-retina.lo
+ at HAVE_GTK3_TRUE@am__objects_7 = $(am__objects_5) $(am__objects_6)
+ at HAVE_GTK3_TRUE@am_ddb_gui_GTK3_la_OBJECTS = $(am__objects_7)
 ddb_gui_GTK3_la_OBJECTS = $(am_ddb_gui_GTK3_la_OBJECTS)
-ddb_gui_GTK3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ddb_gui_GTK3_la_CFLAGS) \
-	$(CFLAGS) $(ddb_gui_GTK3_la_LDFLAGS) $(LDFLAGS) -o $@
+ddb_gui_GTK3_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(OBJCLD) \
+	$(ddb_gui_GTK3_la_OBJCFLAGS) $(OBJCFLAGS) \
+	$(ddb_gui_GTK3_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE at am_ddb_gui_GTK3_la_rpath =  \
 @HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE@	-rpath \
 @HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE@	$(pkglibdir)
@@ -305,19 +314,58 @@ ddb_gui_GTK3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at am_ddb_gui_GTK3_la_rpath =  \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@	-rpath \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@	$(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
+LTOBJCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_OBJCFLAGS) $(OBJCFLAGS)
+AM_V_OBJC = $(am__v_OBJC_ at AM_V@)
+am__v_OBJC_ = $(am__v_OBJC_ at AM_DEFAULT_V@)
+am__v_OBJC_0 = @echo "  OBJC    " $@;
+am__v_OBJC_1 = 
+OBJCLD = $(OBJC)
+OBJCLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_OBJCLD = $(am__v_OBJCLD_ at AM_V@)
+am__v_OBJCLD_ = $(am__v_OBJCLD_ at AM_DEFAULT_V@)
+am__v_OBJCLD_0 = @echo "  OBJCLD  " $@;
+am__v_OBJCLD_1 = 
 SOURCES = $(ddb_gui_GTK2_fallback_la_SOURCES) \
 	$(ddb_gui_GTK2_la_SOURCES) $(ddb_gui_GTK3_la_SOURCES)
 DIST_SOURCES = $(am__ddb_gui_GTK2_fallback_la_SOURCES_DIST) \
@@ -329,6 +377,23 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 HEADERS = $(sdk_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -355,6 +420,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -375,10 +441,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -401,6 +469,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -454,6 +523,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -472,6 +542,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -497,13 +569,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -512,7 +588,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -584,10 +662,7 @@ gtkuidir = $(libdir)/$(PACKAGE)
 #SM_CFLAGS = -DEGG_SM_CLIENT_BACKEND_XSMP -DG_LOG_DOMAIN=\""deadbeef"\"
 #endif
 #endif
-
-#if OS_OSX
-#OSXSRC = retina.m
-#endif
+ at OS_OSX_TRUE@osx_sources = retina.m
 GTKUI_SOURCES = gtkui.c gtkui.h\
 				   callbacks.c interface.c support.c callbacks.h interface.h support.h\
 				   ddblistview.c ddblistview.h\
@@ -623,13 +698,14 @@ GTKUI_SOURCES = gtkui.c gtkui.h\
 sdkdir = $(pkgincludedir)
 sdk_HEADERS = gtkui_api.h
 EXTRA_DIST = deadbeef.glade
-GTKGLEXT2_LIBS = -lGL -lGLU
-GTKGLEXT3_LIBS = 
 @HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE at pkglib_LTLIBRARIES = ddb_gui_GTK3.la
 @HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at pkglib_LTLIBRARIES = ddb_gui_GTK3.la
 @HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_FALSE at pkglib_LTLIBRARIES = ddb_gui_GTK2.la
 @HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_TRUE at pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK2.fallback.la
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE at pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK3.la
+
+#GTKGLEXT2_LIBS =
+#GTKGLEXT3_LIBS =
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK2.fallback.la ddb_gui_GTK3.la
 
 # normal lib
@@ -696,15 +772,13 @@ GTKGLEXT3_LIBS =
 #	gtkglext-gtk2/gdk/glext/glext.h\
 #	gtkglext-gtk2/gdk/glext/glxext-extra.h\
 #	gtkglext-gtk2/gdk/glext/glxext.h
- at HAVE_GTK2_TRUE@GTKGLEXT_CFLAGS_GTK2 = -I at top_srcdir@/plugins/gtkui/gtkglext-gtk2 -I at top_srcdir@/plugins/gtkui/gtkglext-gtk2/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
+
+#GTKGLEXT_CFLAGS_GTK2 = -I at top_srcdir@/plugins/gtkui/gtkglext-gtk2 -I at top_srcdir@/plugins/gtkui/gtkglext-gtk2/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
 @HAVE_GTK2_TRUE at ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES_GTK2)
- at HAVE_GTK2_TRUE@ddb_gui_GTK2_la_LDFLAGS = -module
- at HAVE_GTK2_TRUE@@STATICLINK_TRUE at GTK_ROOT_216 = @top_srcdir@/$(LIB)/gtk-2.16.0
- at HAVE_GTK2_TRUE@@STATICLINK_FALSE at ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a  $(GTKGLEXT2_LIBS)
- at HAVE_GTK2_TRUE@@STATICLINK_TRUE at ddb_gui_GTK2_la_LIBADD = $(LDADD) -L$(GTK_ROOT_216)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS)
- at HAVE_GTK2_TRUE@@STATICLINK_FALSE at ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2) -DDDB_WARN_DEPRECATED=1
- at HAVE_GTK2_TRUE@@STATICLINK_TRUE at ddb_gui_GTK2_la_CFLAGS = -std=c99 -I$(GTK_ROOT_216)/include/gtk-2.0 -I$(GTK_ROOT_216)/lib/gtk-2.0/include -I$(GTK_ROOT_216)/include/atk-1.0 -I$(GTK_ROOT_216)/include/cairo -I$(GTK_ROOT_216)/include/pango-1.0 -I$(GTK_ROOT_216)/include -I$(GTK_ROOT_216)/include/glib-2.0 -I$(GTK_ROOT_216)/lib/glib-2.0/include $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2)
- at HAVE_GTK3_TRUE@GTKUI_SOURCES_GTK3 = $(GTKUI_SOURCES)
+ at HAVE_GTK2_TRUE@ddb_gui_GTK2_la_LDFLAGS = -module -avoid-version
+ at HAVE_GTK2_TRUE@ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a  $(GTKGLEXT2_LIBS)
+ at HAVE_GTK2_TRUE@ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2) -DDDB_WARN_DEPRECATED=1
+ at HAVE_GTK3_TRUE@GTKUI_SOURCES_GTK3 = $(GTKUI_SOURCES) $(osx_sources)
 
 #	gtkglext-gtk3/gtk/gtkglinit.c\
 #	gtkglext-gtk3/gtk/gtkglversion.c\
@@ -764,26 +838,22 @@ GTKGLEXT3_LIBS =
 #	gtkglext-gtk3/gdk/gdkglext-config.h\
 #	gtkglext-gtk3/gdk/gdkglversion.h
 @HAVE_GTK3_TRUE at GTKGLEXT_CFLAGS_GTK3 = -I at top_srcdir@/plugins/gtkui/gtkglext-gtk3 -I at top_srcdir@/plugins/gtkui/gtkglext-gtk3/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
- at HAVE_GTK3_TRUE@ddb_gui_GTK3_la_LDFLAGS = -module
- at HAVE_GTK3_TRUE@@STATICLINK_FALSE at ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
- at HAVE_GTK3_TRUE@@STATICLINK_TRUE at ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
- at HAVE_GTK3_TRUE@@STATICLINK_TRUE at GTK_ROOT_300 = @top_srcdir@/$(LIB)/gtk-3.0.0
- at HAVE_GTK3_TRUE@@STATICLINK_FALSE at ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT3_LIBS)
- at HAVE_GTK3_TRUE@@STATICLINK_TRUE at ddb_gui_GTK3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT3_LIBS)
- at HAVE_GTK3_TRUE@@STATICLINK_FALSE at ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
- at HAVE_GTK3_TRUE@@STATICLINK_TRUE at ddb_gui_GTK3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
- at HAVE_GTK3_TRUE@@STATICLINK_FALSE at ddb_gui_GTK3_la_OBJCFLAGS = $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
+ at HAVE_GTK3_TRUE@ddb_gui_GTK3_la_LDFLAGS = -module -avoid-version
+ at HAVE_GTK3_TRUE@ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
+ at HAVE_GTK3_TRUE@ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT3_LIBS)
+ at HAVE_GTK3_TRUE@ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
+ at HAVE_GTK3_TRUE@ddb_gui_GTK3_la_OBJCFLAGS = $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
 
 # fallback lib
 @STATICLINK_TRUE at GTK_ROOT = @top_srcdir@/$(LIB)/gtk-2.12.12/usr
 @STATICLINK_TRUE at ddb_gui_GTK2_fallback_la_SOURCES = $(GTKUI_SOURCES_GTK2)
- at STATICLINK_TRUE@ddb_gui_GTK2_fallback_la_LDFLAGS = -module
- at STATICLINK_TRUE@ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS)
+ at STATICLINK_TRUE@ddb_gui_GTK2_fallback_la_LDFLAGS = -module -avoid-version
+ at STATICLINK_TRUE@ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lgthread-2.0 -lrt -lglib-2.0 $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS)
 @STATICLINK_TRUE at ddb_gui_GTK2_fallback_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2)
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .lo .m .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -814,6 +884,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -840,18 +911,23 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 ddb_gui_GTK2.fallback.la: $(ddb_gui_GTK2_fallback_la_OBJECTS) $(ddb_gui_GTK2_fallback_la_DEPENDENCIES) $(EXTRA_ddb_gui_GTK2_fallback_la_DEPENDENCIES) 
-	$(ddb_gui_GTK2_fallback_la_LINK) $(am_ddb_gui_GTK2_fallback_la_rpath) $(ddb_gui_GTK2_fallback_la_OBJECTS) $(ddb_gui_GTK2_fallback_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(ddb_gui_GTK2_fallback_la_LINK) $(am_ddb_gui_GTK2_fallback_la_rpath) $(ddb_gui_GTK2_fallback_la_OBJECTS) $(ddb_gui_GTK2_fallback_la_LIBADD) $(LIBS)
+
 ddb_gui_GTK2.la: $(ddb_gui_GTK2_la_OBJECTS) $(ddb_gui_GTK2_la_DEPENDENCIES) $(EXTRA_ddb_gui_GTK2_la_DEPENDENCIES) 
-	$(ddb_gui_GTK2_la_LINK) $(am_ddb_gui_GTK2_la_rpath) $(ddb_gui_GTK2_la_OBJECTS) $(ddb_gui_GTK2_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(ddb_gui_GTK2_la_LINK) $(am_ddb_gui_GTK2_la_rpath) $(ddb_gui_GTK2_la_OBJECTS) $(ddb_gui_GTK2_la_LIBADD) $(LIBS)
+
 ddb_gui_GTK3.la: $(ddb_gui_GTK3_la_OBJECTS) $(ddb_gui_GTK3_la_DEPENDENCIES) $(EXTRA_ddb_gui_GTK3_la_DEPENDENCIES) 
-	$(ddb_gui_GTK3_la_LINK) $(am_ddb_gui_GTK3_la_rpath) $(ddb_gui_GTK3_la_OBJECTS) $(ddb_gui_GTK3_la_LIBADD) $(LIBS)
+	$(AM_V_OBJCLD)$(ddb_gui_GTK3_la_LINK) $(am_ddb_gui_GTK3_la_rpath) $(ddb_gui_GTK3_la_OBJECTS) $(ddb_gui_GTK3_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -949,6 +1025,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-prefwin.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-progress.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-retina.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-search.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-support.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Plo at am__quote@
@@ -957,697 +1034,725 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-wingeom.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 ddb_gui_GTK2_fallback_la-gtkui.lo: gtkui.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Tpo -c -o ddb_gui_GTK2_fallback_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkui.c' object='ddb_gui_GTK2_fallback_la-gtkui.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Tpo -c -o ddb_gui_GTK2_fallback_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gtkui.c' object='ddb_gui_GTK2_fallback_la-gtkui.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
 
 ddb_gui_GTK2_fallback_la-callbacks.lo: callbacks.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Tpo -c -o ddb_gui_GTK2_fallback_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='callbacks.c' object='ddb_gui_GTK2_fallback_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Tpo -c -o ddb_gui_GTK2_fallback_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='callbacks.c' object='ddb_gui_GTK2_fallback_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
 
 ddb_gui_GTK2_fallback_la-interface.lo: interface.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Tpo -c -o ddb_gui_GTK2_fallback_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interface.c' object='ddb_gui_GTK2_fallback_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Tpo -c -o ddb_gui_GTK2_fallback_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='interface.c' object='ddb_gui_GTK2_fallback_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
 
 ddb_gui_GTK2_fallback_la-support.lo: support.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Tpo -c -o ddb_gui_GTK2_fallback_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='support.c' object='ddb_gui_GTK2_fallback_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Tpo -c -o ddb_gui_GTK2_fallback_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='support.c' object='ddb_gui_GTK2_fallback_la-support.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
 
 ddb_gui_GTK2_fallback_la-ddblistview.lo: ddblistview.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Tpo -c -o ddb_gui_GTK2_fallback_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddblistview.c' object='ddb_gui_GTK2_fallback_la-ddblistview.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Tpo -c -o ddb_gui_GTK2_fallback_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddblistview.c' object='ddb_gui_GTK2_fallback_la-ddblistview.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
 
 ddb_gui_GTK2_fallback_la-mainplaylist.lo: mainplaylist.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Tpo -c -o ddb_gui_GTK2_fallback_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mainplaylist.c' object='ddb_gui_GTK2_fallback_la-mainplaylist.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Tpo -c -o ddb_gui_GTK2_fallback_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mainplaylist.c' object='ddb_gui_GTK2_fallback_la-mainplaylist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
 
 ddb_gui_GTK2_fallback_la-gdkdrawing.lo: gdkdrawing.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Tpo -c -o ddb_gui_GTK2_fallback_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gdkdrawing.c' object='ddb_gui_GTK2_fallback_la-gdkdrawing.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Tpo -c -o ddb_gui_GTK2_fallback_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gdkdrawing.c' object='ddb_gui_GTK2_fallback_la-gdkdrawing.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
 
 ddb_gui_GTK2_fallback_la-progress.lo: progress.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Tpo -c -o ddb_gui_GTK2_fallback_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='progress.c' object='ddb_gui_GTK2_fallback_la-progress.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Tpo -c -o ddb_gui_GTK2_fallback_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='progress.c' object='ddb_gui_GTK2_fallback_la-progress.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
 
 ddb_gui_GTK2_fallback_la-search.lo: search.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Tpo -c -o ddb_gui_GTK2_fallback_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='search.c' object='ddb_gui_GTK2_fallback_la-search.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Tpo -c -o ddb_gui_GTK2_fallback_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='search.c' object='ddb_gui_GTK2_fallback_la-search.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
 
 ddb_gui_GTK2_fallback_la-fileman.lo: fileman.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Tpo -c -o ddb_gui_GTK2_fallback_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fileman.c' object='ddb_gui_GTK2_fallback_la-fileman.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Tpo -c -o ddb_gui_GTK2_fallback_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fileman.c' object='ddb_gui_GTK2_fallback_la-fileman.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
 
 ddb_gui_GTK2_fallback_la-pluginconf.lo: pluginconf.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Tpo -c -o ddb_gui_GTK2_fallback_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pluginconf.c' object='ddb_gui_GTK2_fallback_la-pluginconf.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Tpo -c -o ddb_gui_GTK2_fallback_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pluginconf.c' object='ddb_gui_GTK2_fallback_la-pluginconf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
 
 ddb_gui_GTK2_fallback_la-ddbtabstrip.lo: ddbtabstrip.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbtabstrip.c' object='ddb_gui_GTK2_fallback_la-ddbtabstrip.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddbtabstrip.c' object='ddb_gui_GTK2_fallback_la-ddbtabstrip.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
 
 ddb_gui_GTK2_fallback_la-ddbvolumebar.lo: ddbvolumebar.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbvolumebar.c' object='ddb_gui_GTK2_fallback_la-ddbvolumebar.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddbvolumebar.c' object='ddb_gui_GTK2_fallback_la-ddbvolumebar.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
 
 ddb_gui_GTK2_fallback_la-trkproperties.lo: trkproperties.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Tpo -c -o ddb_gui_GTK2_fallback_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='trkproperties.c' object='ddb_gui_GTK2_fallback_la-trkproperties.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Tpo -c -o ddb_gui_GTK2_fallback_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='trkproperties.c' object='ddb_gui_GTK2_fallback_la-trkproperties.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
 
 ddb_gui_GTK2_fallback_la-coverart.lo: coverart.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Tpo -c -o ddb_gui_GTK2_fallback_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='coverart.c' object='ddb_gui_GTK2_fallback_la-coverart.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Tpo -c -o ddb_gui_GTK2_fallback_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='coverart.c' object='ddb_gui_GTK2_fallback_la-coverart.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
 
 ddb_gui_GTK2_fallback_la-plcommon.lo: plcommon.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Tpo -c -o ddb_gui_GTK2_fallback_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='plcommon.c' object='ddb_gui_GTK2_fallback_la-plcommon.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Tpo -c -o ddb_gui_GTK2_fallback_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plcommon.c' object='ddb_gui_GTK2_fallback_la-plcommon.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
 
 ddb_gui_GTK2_fallback_la-prefwin.lo: prefwin.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Tpo -c -o ddb_gui_GTK2_fallback_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='prefwin.c' object='ddb_gui_GTK2_fallback_la-prefwin.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Tpo -c -o ddb_gui_GTK2_fallback_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='prefwin.c' object='ddb_gui_GTK2_fallback_la-prefwin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
 
 ddb_gui_GTK2_fallback_la-eq.lo: eq.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Tpo -c -o ddb_gui_GTK2_fallback_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eq.c' object='ddb_gui_GTK2_fallback_la-eq.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Tpo -c -o ddb_gui_GTK2_fallback_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eq.c' object='ddb_gui_GTK2_fallback_la-eq.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
 
 ddb_gui_GTK2_fallback_la-actions.lo: actions.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Tpo -c -o ddb_gui_GTK2_fallback_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='actions.c' object='ddb_gui_GTK2_fallback_la-actions.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Tpo -c -o ddb_gui_GTK2_fallback_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='actions.c' object='ddb_gui_GTK2_fallback_la-actions.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
 
 ddb_gui_GTK2_fallback_la-dspconfig.lo: dspconfig.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Tpo -c -o ddb_gui_GTK2_fallback_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dspconfig.c' object='ddb_gui_GTK2_fallback_la-dspconfig.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Tpo -c -o ddb_gui_GTK2_fallback_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dspconfig.c' object='ddb_gui_GTK2_fallback_la-dspconfig.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
 
 ddb_gui_GTK2_fallback_la-tagwritersettings.lo: tagwritersettings.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Tpo -c -o ddb_gui_GTK2_fallback_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tagwritersettings.c' object='ddb_gui_GTK2_fallback_la-tagwritersettings.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Tpo -c -o ddb_gui_GTK2_fallback_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tagwritersettings.c' object='ddb_gui_GTK2_fallback_la-tagwritersettings.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
 
 ddb_gui_GTK2_fallback_la-wingeom.lo: wingeom.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Tpo -c -o ddb_gui_GTK2_fallback_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='wingeom.c' object='ddb_gui_GTK2_fallback_la-wingeom.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Tpo -c -o ddb_gui_GTK2_fallback_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='wingeom.c' object='ddb_gui_GTK2_fallback_la-wingeom.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
 
 ddb_gui_GTK2_fallback_la-widgets.lo: widgets.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-widgets.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Tpo -c -o ddb_gui_GTK2_fallback_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='widgets.c' object='ddb_gui_GTK2_fallback_la-widgets.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-widgets.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Tpo -c -o ddb_gui_GTK2_fallback_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='widgets.c' object='ddb_gui_GTK2_fallback_la-widgets.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
 
 ddb_gui_GTK2_fallback_la-ddbseekbar.lo: ddbseekbar.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbseekbar.c' object='ddb_gui_GTK2_fallback_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddbseekbar.c' object='ddb_gui_GTK2_fallback_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
 
 ddb_gui_GTK2_fallback_la-ddbequalizer.lo: ddbequalizer.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbequalizer.c' object='ddb_gui_GTK2_fallback_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddbequalizer.c' object='ddb_gui_GTK2_fallback_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
 
 ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo: ddbcellrenderertextmultiline.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
 
 ddb_gui_GTK2_fallback_la-gtkuigl.lo: gtkuigl.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gtkuigl.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Tpo -c -o ddb_gui_GTK2_fallback_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkuigl.c' object='ddb_gui_GTK2_fallback_la-gtkuigl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gtkuigl.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Tpo -c -o ddb_gui_GTK2_fallback_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gtkuigl.c' object='ddb_gui_GTK2_fallback_la-gtkuigl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
 
 ddb_gui_GTK2_fallback_la-hotkeys.lo: hotkeys.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-hotkeys.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Tpo -c -o ddb_gui_GTK2_fallback_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hotkeys.c' object='ddb_gui_GTK2_fallback_la-hotkeys.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-hotkeys.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Tpo -c -o ddb_gui_GTK2_fallback_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hotkeys.c' object='ddb_gui_GTK2_fallback_la-hotkeys.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
 
 ddb_gui_GTK2_fallback_la-actionhandlers.lo: actionhandlers.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-actionhandlers.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Tpo -c -o ddb_gui_GTK2_fallback_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='actionhandlers.c' object='ddb_gui_GTK2_fallback_la-actionhandlers.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-actionhandlers.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Tpo -c -o ddb_gui_GTK2_fallback_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='actionhandlers.c' object='ddb_gui_GTK2_fallback_la-actionhandlers.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
 
 ddb_gui_GTK2_fallback_la-pltmenu.lo: pltmenu.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-pltmenu.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Tpo -c -o ddb_gui_GTK2_fallback_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pltmenu.c' object='ddb_gui_GTK2_fallback_la-pltmenu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-pltmenu.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Tpo -c -o ddb_gui_GTK2_fallback_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pltmenu.c' object='ddb_gui_GTK2_fallback_la-pltmenu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
 
 ddb_gui_GTK2_fallback_la-ctmapping.lo: ctmapping.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ctmapping.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Tpo -c -o ddb_gui_GTK2_fallback_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ctmapping.c' object='ddb_gui_GTK2_fallback_la-ctmapping.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ctmapping.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Tpo -c -o ddb_gui_GTK2_fallback_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctmapping.c' object='ddb_gui_GTK2_fallback_la-ctmapping.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
 
 ddb_gui_GTK2_fallback_la-namedicons.lo: namedicons.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-namedicons.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Tpo -c -o ddb_gui_GTK2_fallback_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='namedicons.c' object='ddb_gui_GTK2_fallback_la-namedicons.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-namedicons.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Tpo -c -o ddb_gui_GTK2_fallback_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='namedicons.c' object='ddb_gui_GTK2_fallback_la-namedicons.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
 
 ddb_gui_GTK2_la-gtkui.lo: gtkui.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Tpo -c -o ddb_gui_GTK2_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkui.c' object='ddb_gui_GTK2_la-gtkui.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Tpo -c -o ddb_gui_GTK2_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gtkui.c' object='ddb_gui_GTK2_la-gtkui.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
 
 ddb_gui_GTK2_la-callbacks.lo: callbacks.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Tpo -c -o ddb_gui_GTK2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='callbacks.c' object='ddb_gui_GTK2_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Tpo -c -o ddb_gui_GTK2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='callbacks.c' object='ddb_gui_GTK2_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
 
 ddb_gui_GTK2_la-interface.lo: interface.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-interface.Tpo -c -o ddb_gui_GTK2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK2_la-interface.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interface.c' object='ddb_gui_GTK2_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-interface.Tpo -c -o ddb_gui_GTK2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK2_la-interface.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='interface.c' object='ddb_gui_GTK2_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
 
 ddb_gui_GTK2_la-support.lo: support.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-support.Tpo -c -o ddb_gui_GTK2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-support.Tpo $(DEPDIR)/ddb_gui_GTK2_la-support.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='support.c' object='ddb_gui_GTK2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-support.Tpo -c -o ddb_gui_GTK2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-support.Tpo $(DEPDIR)/ddb_gui_GTK2_la-support.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='support.c' object='ddb_gui_GTK2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
 
 ddb_gui_GTK2_la-ddblistview.lo: ddblistview.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Tpo -c -o ddb_gui_GTK2_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddblistview.c' object='ddb_gui_GTK2_la-ddblistview.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Tpo -c -o ddb_gui_GTK2_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddblistview.c' object='ddb_gui_GTK2_la-ddblistview.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
 
 ddb_gui_GTK2_la-mainplaylist.lo: mainplaylist.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Tpo -c -o ddb_gui_GTK2_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mainplaylist.c' object='ddb_gui_GTK2_la-mainplaylist.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Tpo -c -o ddb_gui_GTK2_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mainplaylist.c' object='ddb_gui_GTK2_la-mainplaylist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
 
 ddb_gui_GTK2_la-gdkdrawing.lo: gdkdrawing.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Tpo -c -o ddb_gui_GTK2_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gdkdrawing.c' object='ddb_gui_GTK2_la-gdkdrawing.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Tpo -c -o ddb_gui_GTK2_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gdkdrawing.c' object='ddb_gui_GTK2_la-gdkdrawing.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
 
 ddb_gui_GTK2_la-progress.lo: progress.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-progress.Tpo -c -o ddb_gui_GTK2_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK2_la-progress.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='progress.c' object='ddb_gui_GTK2_la-progress.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-progress.Tpo -c -o ddb_gui_GTK2_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK2_la-progress.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='progress.c' object='ddb_gui_GTK2_la-progress.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
 
 ddb_gui_GTK2_la-search.lo: search.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-search.Tpo -c -o ddb_gui_GTK2_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-search.Tpo $(DEPDIR)/ddb_gui_GTK2_la-search.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='search.c' object='ddb_gui_GTK2_la-search.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-search.Tpo -c -o ddb_gui_GTK2_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-search.Tpo $(DEPDIR)/ddb_gui_GTK2_la-search.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='search.c' object='ddb_gui_GTK2_la-search.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
 
 ddb_gui_GTK2_la-fileman.lo: fileman.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-fileman.Tpo -c -o ddb_gui_GTK2_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK2_la-fileman.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fileman.c' object='ddb_gui_GTK2_la-fileman.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-fileman.Tpo -c -o ddb_gui_GTK2_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK2_la-fileman.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fileman.c' object='ddb_gui_GTK2_la-fileman.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
 
 ddb_gui_GTK2_la-pluginconf.lo: pluginconf.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Tpo -c -o ddb_gui_GTK2_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pluginconf.c' object='ddb_gui_GTK2_la-pluginconf.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Tpo -c -o ddb_gui_GTK2_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pluginconf.c' object='ddb_gui_GTK2_la-pluginconf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
 
 ddb_gui_GTK2_la-ddbtabstrip.lo: ddbtabstrip.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK2_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbtabstrip.c' object='ddb_gui_GTK2_la-ddbtabstrip.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK2_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddbtabstrip.c' object='ddb_gui_GTK2_la-ddbtabstrip.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
 
 ddb_gui_GTK2_la-ddbvolumebar.lo: ddbvolumebar.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK2_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbvolumebar.c' object='ddb_gui_GTK2_la-ddbvolumebar.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK2_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddbvolumebar.c' object='ddb_gui_GTK2_la-ddbvolumebar.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
 
 ddb_gui_GTK2_la-trkproperties.lo: trkproperties.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Tpo -c -o ddb_gui_GTK2_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='trkproperties.c' object='ddb_gui_GTK2_la-trkproperties.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Tpo -c -o ddb_gui_GTK2_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='trkproperties.c' object='ddb_gui_GTK2_la-trkproperties.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
 
 ddb_gui_GTK2_la-coverart.lo: coverart.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-coverart.Tpo -c -o ddb_gui_GTK2_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK2_la-coverart.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='coverart.c' object='ddb_gui_GTK2_la-coverart.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-coverart.Tpo -c -o ddb_gui_GTK2_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK2_la-coverart.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='coverart.c' object='ddb_gui_GTK2_la-coverart.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
 
 ddb_gui_GTK2_la-plcommon.lo: plcommon.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Tpo -c -o ddb_gui_GTK2_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='plcommon.c' object='ddb_gui_GTK2_la-plcommon.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Tpo -c -o ddb_gui_GTK2_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plcommon.c' object='ddb_gui_GTK2_la-plcommon.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
 
 ddb_gui_GTK2_la-prefwin.lo: prefwin.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Tpo -c -o ddb_gui_GTK2_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='prefwin.c' object='ddb_gui_GTK2_la-prefwin.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Tpo -c -o ddb_gui_GTK2_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='prefwin.c' object='ddb_gui_GTK2_la-prefwin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
 
 ddb_gui_GTK2_la-eq.lo: eq.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-eq.Tpo -c -o ddb_gui_GTK2_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK2_la-eq.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eq.c' object='ddb_gui_GTK2_la-eq.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-eq.Tpo -c -o ddb_gui_GTK2_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK2_la-eq.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eq.c' object='ddb_gui_GTK2_la-eq.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
 
 ddb_gui_GTK2_la-actions.lo: actions.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-actions.Tpo -c -o ddb_gui_GTK2_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK2_la-actions.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='actions.c' object='ddb_gui_GTK2_la-actions.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-actions.Tpo -c -o ddb_gui_GTK2_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK2_la-actions.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='actions.c' object='ddb_gui_GTK2_la-actions.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
 
 ddb_gui_GTK2_la-dspconfig.lo: dspconfig.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Tpo -c -o ddb_gui_GTK2_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dspconfig.c' object='ddb_gui_GTK2_la-dspconfig.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Tpo -c -o ddb_gui_GTK2_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dspconfig.c' object='ddb_gui_GTK2_la-dspconfig.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
 
 ddb_gui_GTK2_la-tagwritersettings.lo: tagwritersettings.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Tpo -c -o ddb_gui_GTK2_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tagwritersettings.c' object='ddb_gui_GTK2_la-tagwritersettings.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Tpo -c -o ddb_gui_GTK2_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tagwritersettings.c' object='ddb_gui_GTK2_la-tagwritersettings.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
 
 ddb_gui_GTK2_la-wingeom.lo: wingeom.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Tpo -c -o ddb_gui_GTK2_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='wingeom.c' object='ddb_gui_GTK2_la-wingeom.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Tpo -c -o ddb_gui_GTK2_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='wingeom.c' object='ddb_gui_GTK2_la-wingeom.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
 
 ddb_gui_GTK2_la-widgets.lo: widgets.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-widgets.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-widgets.Tpo -c -o ddb_gui_GTK2_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-widgets.Tpo $(DEPDIR)/ddb_gui_GTK2_la-widgets.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='widgets.c' object='ddb_gui_GTK2_la-widgets.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-widgets.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-widgets.Tpo -c -o ddb_gui_GTK2_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-widgets.Tpo $(DEPDIR)/ddb_gui_GTK2_la-widgets.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='widgets.c' object='ddb_gui_GTK2_la-widgets.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
 
 ddb_gui_GTK2_la-ddbseekbar.lo: ddbseekbar.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Tpo -c -o ddb_gui_GTK2_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbseekbar.c' object='ddb_gui_GTK2_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Tpo -c -o ddb_gui_GTK2_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddbseekbar.c' object='ddb_gui_GTK2_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
 
 ddb_gui_GTK2_la-ddbequalizer.lo: ddbequalizer.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Tpo -c -o ddb_gui_GTK2_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbequalizer.c' object='ddb_gui_GTK2_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Tpo -c -o ddb_gui_GTK2_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddbequalizer.c' object='ddb_gui_GTK2_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
 
 ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo: ddbcellrenderertextmultiline.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
 
 ddb_gui_GTK2_la-gtkuigl.lo: gtkuigl.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gtkuigl.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Tpo -c -o ddb_gui_GTK2_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkuigl.c' object='ddb_gui_GTK2_la-gtkuigl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gtkuigl.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Tpo -c -o ddb_gui_GTK2_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gtkuigl.c' object='ddb_gui_GTK2_la-gtkuigl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
 
 ddb_gui_GTK2_la-hotkeys.lo: hotkeys.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-hotkeys.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Tpo -c -o ddb_gui_GTK2_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Tpo $(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hotkeys.c' object='ddb_gui_GTK2_la-hotkeys.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-hotkeys.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Tpo -c -o ddb_gui_GTK2_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Tpo $(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hotkeys.c' object='ddb_gui_GTK2_la-hotkeys.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
 
 ddb_gui_GTK2_la-actionhandlers.lo: actionhandlers.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-actionhandlers.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Tpo -c -o ddb_gui_GTK2_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Tpo $(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='actionhandlers.c' object='ddb_gui_GTK2_la-actionhandlers.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-actionhandlers.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Tpo -c -o ddb_gui_GTK2_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Tpo $(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='actionhandlers.c' object='ddb_gui_GTK2_la-actionhandlers.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
 
 ddb_gui_GTK2_la-pltmenu.lo: pltmenu.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-pltmenu.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Tpo -c -o ddb_gui_GTK2_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Tpo $(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pltmenu.c' object='ddb_gui_GTK2_la-pltmenu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-pltmenu.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Tpo -c -o ddb_gui_GTK2_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Tpo $(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pltmenu.c' object='ddb_gui_GTK2_la-pltmenu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
 
 ddb_gui_GTK2_la-ctmapping.lo: ctmapping.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ctmapping.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Tpo -c -o ddb_gui_GTK2_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ctmapping.c' object='ddb_gui_GTK2_la-ctmapping.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ctmapping.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Tpo -c -o ddb_gui_GTK2_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctmapping.c' object='ddb_gui_GTK2_la-ctmapping.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
 
 ddb_gui_GTK2_la-namedicons.lo: namedicons.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-namedicons.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-namedicons.Tpo -c -o ddb_gui_GTK2_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-namedicons.Tpo $(DEPDIR)/ddb_gui_GTK2_la-namedicons.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='namedicons.c' object='ddb_gui_GTK2_la-namedicons.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-namedicons.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-namedicons.Tpo -c -o ddb_gui_GTK2_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-namedicons.Tpo $(DEPDIR)/ddb_gui_GTK2_la-namedicons.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='namedicons.c' object='ddb_gui_GTK2_la-namedicons.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
 
 ddb_gui_GTK3_la-gtkui.lo: gtkui.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-gtkui.Tpo -c -o ddb_gui_GTK3_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK3_la-gtkui.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkui.c' object='ddb_gui_GTK3_la-gtkui.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-gtkui.Tpo -c -o ddb_gui_GTK3_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK3_la-gtkui.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gtkui.c' object='ddb_gui_GTK3_la-gtkui.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
 
 ddb_gui_GTK3_la-callbacks.lo: callbacks.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-callbacks.Tpo -c -o ddb_gui_GTK3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK3_la-callbacks.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='callbacks.c' object='ddb_gui_GTK3_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-callbacks.Tpo -c -o ddb_gui_GTK3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK3_la-callbacks.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='callbacks.c' object='ddb_gui_GTK3_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
 
 ddb_gui_GTK3_la-interface.lo: interface.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-interface.Tpo -c -o ddb_gui_GTK3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK3_la-interface.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interface.c' object='ddb_gui_GTK3_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-interface.Tpo -c -o ddb_gui_GTK3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK3_la-interface.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='interface.c' object='ddb_gui_GTK3_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
 
 ddb_gui_GTK3_la-support.lo: support.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-support.Tpo -c -o ddb_gui_GTK3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-support.Tpo $(DEPDIR)/ddb_gui_GTK3_la-support.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='support.c' object='ddb_gui_GTK3_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-support.Tpo -c -o ddb_gui_GTK3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-support.Tpo $(DEPDIR)/ddb_gui_GTK3_la-support.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='support.c' object='ddb_gui_GTK3_la-support.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
 
 ddb_gui_GTK3_la-ddblistview.lo: ddblistview.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Tpo -c -o ddb_gui_GTK3_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddblistview.c' object='ddb_gui_GTK3_la-ddblistview.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Tpo -c -o ddb_gui_GTK3_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddblistview.c' object='ddb_gui_GTK3_la-ddblistview.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
 
 ddb_gui_GTK3_la-mainplaylist.lo: mainplaylist.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Tpo -c -o ddb_gui_GTK3_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mainplaylist.c' object='ddb_gui_GTK3_la-mainplaylist.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Tpo -c -o ddb_gui_GTK3_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mainplaylist.c' object='ddb_gui_GTK3_la-mainplaylist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
 
 ddb_gui_GTK3_la-gdkdrawing.lo: gdkdrawing.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Tpo -c -o ddb_gui_GTK3_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gdkdrawing.c' object='ddb_gui_GTK3_la-gdkdrawing.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Tpo -c -o ddb_gui_GTK3_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gdkdrawing.c' object='ddb_gui_GTK3_la-gdkdrawing.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
 
 ddb_gui_GTK3_la-progress.lo: progress.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-progress.Tpo -c -o ddb_gui_GTK3_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK3_la-progress.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='progress.c' object='ddb_gui_GTK3_la-progress.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-progress.Tpo -c -o ddb_gui_GTK3_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK3_la-progress.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='progress.c' object='ddb_gui_GTK3_la-progress.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
 
 ddb_gui_GTK3_la-search.lo: search.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-search.Tpo -c -o ddb_gui_GTK3_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-search.Tpo $(DEPDIR)/ddb_gui_GTK3_la-search.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='search.c' object='ddb_gui_GTK3_la-search.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-search.Tpo -c -o ddb_gui_GTK3_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-search.Tpo $(DEPDIR)/ddb_gui_GTK3_la-search.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='search.c' object='ddb_gui_GTK3_la-search.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
 
 ddb_gui_GTK3_la-fileman.lo: fileman.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-fileman.Tpo -c -o ddb_gui_GTK3_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK3_la-fileman.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fileman.c' object='ddb_gui_GTK3_la-fileman.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-fileman.Tpo -c -o ddb_gui_GTK3_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK3_la-fileman.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fileman.c' object='ddb_gui_GTK3_la-fileman.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
 
 ddb_gui_GTK3_la-pluginconf.lo: pluginconf.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Tpo -c -o ddb_gui_GTK3_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pluginconf.c' object='ddb_gui_GTK3_la-pluginconf.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Tpo -c -o ddb_gui_GTK3_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pluginconf.c' object='ddb_gui_GTK3_la-pluginconf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
 
 ddb_gui_GTK3_la-ddbtabstrip.lo: ddbtabstrip.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK3_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbtabstrip.c' object='ddb_gui_GTK3_la-ddbtabstrip.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK3_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddbtabstrip.c' object='ddb_gui_GTK3_la-ddbtabstrip.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
 
 ddb_gui_GTK3_la-ddbvolumebar.lo: ddbvolumebar.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK3_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbvolumebar.c' object='ddb_gui_GTK3_la-ddbvolumebar.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK3_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddbvolumebar.c' object='ddb_gui_GTK3_la-ddbvolumebar.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
 
 ddb_gui_GTK3_la-trkproperties.lo: trkproperties.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Tpo -c -o ddb_gui_GTK3_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='trkproperties.c' object='ddb_gui_GTK3_la-trkproperties.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Tpo -c -o ddb_gui_GTK3_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='trkproperties.c' object='ddb_gui_GTK3_la-trkproperties.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
 
 ddb_gui_GTK3_la-coverart.lo: coverart.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-coverart.Tpo -c -o ddb_gui_GTK3_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK3_la-coverart.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='coverart.c' object='ddb_gui_GTK3_la-coverart.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-coverart.Tpo -c -o ddb_gui_GTK3_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK3_la-coverart.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='coverart.c' object='ddb_gui_GTK3_la-coverart.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
 
 ddb_gui_GTK3_la-plcommon.lo: plcommon.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-plcommon.Tpo -c -o ddb_gui_GTK3_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK3_la-plcommon.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='plcommon.c' object='ddb_gui_GTK3_la-plcommon.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-plcommon.Tpo -c -o ddb_gui_GTK3_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK3_la-plcommon.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plcommon.c' object='ddb_gui_GTK3_la-plcommon.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
 
 ddb_gui_GTK3_la-prefwin.lo: prefwin.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-prefwin.Tpo -c -o ddb_gui_GTK3_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK3_la-prefwin.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='prefwin.c' object='ddb_gui_GTK3_la-prefwin.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-prefwin.Tpo -c -o ddb_gui_GTK3_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK3_la-prefwin.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='prefwin.c' object='ddb_gui_GTK3_la-prefwin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
 
 ddb_gui_GTK3_la-eq.lo: eq.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-eq.Tpo -c -o ddb_gui_GTK3_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK3_la-eq.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eq.c' object='ddb_gui_GTK3_la-eq.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-eq.Tpo -c -o ddb_gui_GTK3_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK3_la-eq.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eq.c' object='ddb_gui_GTK3_la-eq.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
 
 ddb_gui_GTK3_la-actions.lo: actions.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-actions.Tpo -c -o ddb_gui_GTK3_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK3_la-actions.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='actions.c' object='ddb_gui_GTK3_la-actions.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-actions.Tpo -c -o ddb_gui_GTK3_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK3_la-actions.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='actions.c' object='ddb_gui_GTK3_la-actions.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
 
 ddb_gui_GTK3_la-dspconfig.lo: dspconfig.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Tpo -c -o ddb_gui_GTK3_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dspconfig.c' object='ddb_gui_GTK3_la-dspconfig.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Tpo -c -o ddb_gui_GTK3_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dspconfig.c' object='ddb_gui_GTK3_la-dspconfig.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
 
 ddb_gui_GTK3_la-tagwritersettings.lo: tagwritersettings.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Tpo -c -o ddb_gui_GTK3_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tagwritersettings.c' object='ddb_gui_GTK3_la-tagwritersettings.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Tpo -c -o ddb_gui_GTK3_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tagwritersettings.c' object='ddb_gui_GTK3_la-tagwritersettings.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
 
 ddb_gui_GTK3_la-wingeom.lo: wingeom.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-wingeom.Tpo -c -o ddb_gui_GTK3_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK3_la-wingeom.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='wingeom.c' object='ddb_gui_GTK3_la-wingeom.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-wingeom.Tpo -c -o ddb_gui_GTK3_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK3_la-wingeom.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='wingeom.c' object='ddb_gui_GTK3_la-wingeom.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
 
 ddb_gui_GTK3_la-widgets.lo: widgets.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-widgets.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-widgets.Tpo -c -o ddb_gui_GTK3_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-widgets.Tpo $(DEPDIR)/ddb_gui_GTK3_la-widgets.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='widgets.c' object='ddb_gui_GTK3_la-widgets.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-widgets.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-widgets.Tpo -c -o ddb_gui_GTK3_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-widgets.Tpo $(DEPDIR)/ddb_gui_GTK3_la-widgets.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='widgets.c' object='ddb_gui_GTK3_la-widgets.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
 
 ddb_gui_GTK3_la-ddbseekbar.lo: ddbseekbar.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Tpo -c -o ddb_gui_GTK3_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbseekbar.c' object='ddb_gui_GTK3_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Tpo -c -o ddb_gui_GTK3_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddbseekbar.c' object='ddb_gui_GTK3_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
 
 ddb_gui_GTK3_la-ddbequalizer.lo: ddbequalizer.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Tpo -c -o ddb_gui_GTK3_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbequalizer.c' object='ddb_gui_GTK3_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Tpo -c -o ddb_gui_GTK3_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddbequalizer.c' object='ddb_gui_GTK3_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
 
 ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo: ddbcellrenderertextmultiline.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
 
 ddb_gui_GTK3_la-gtkuigl.lo: gtkuigl.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-gtkuigl.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-gtkuigl.Tpo -c -o ddb_gui_GTK3_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-gtkuigl.Tpo $(DEPDIR)/ddb_gui_GTK3_la-gtkuigl.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkuigl.c' object='ddb_gui_GTK3_la-gtkuigl.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-gtkuigl.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-gtkuigl.Tpo -c -o ddb_gui_GTK3_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-gtkuigl.Tpo $(DEPDIR)/ddb_gui_GTK3_la-gtkuigl.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gtkuigl.c' object='ddb_gui_GTK3_la-gtkuigl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
 
 ddb_gui_GTK3_la-hotkeys.lo: hotkeys.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-hotkeys.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-hotkeys.Tpo -c -o ddb_gui_GTK3_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-hotkeys.Tpo $(DEPDIR)/ddb_gui_GTK3_la-hotkeys.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hotkeys.c' object='ddb_gui_GTK3_la-hotkeys.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-hotkeys.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-hotkeys.Tpo -c -o ddb_gui_GTK3_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-hotkeys.Tpo $(DEPDIR)/ddb_gui_GTK3_la-hotkeys.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hotkeys.c' object='ddb_gui_GTK3_la-hotkeys.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
 
 ddb_gui_GTK3_la-actionhandlers.lo: actionhandlers.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-actionhandlers.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-actionhandlers.Tpo -c -o ddb_gui_GTK3_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-actionhandlers.Tpo $(DEPDIR)/ddb_gui_GTK3_la-actionhandlers.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='actionhandlers.c' object='ddb_gui_GTK3_la-actionhandlers.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-actionhandlers.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-actionhandlers.Tpo -c -o ddb_gui_GTK3_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-actionhandlers.Tpo $(DEPDIR)/ddb_gui_GTK3_la-actionhandlers.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='actionhandlers.c' object='ddb_gui_GTK3_la-actionhandlers.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
 
 ddb_gui_GTK3_la-pltmenu.lo: pltmenu.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-pltmenu.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-pltmenu.Tpo -c -o ddb_gui_GTK3_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-pltmenu.Tpo $(DEPDIR)/ddb_gui_GTK3_la-pltmenu.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pltmenu.c' object='ddb_gui_GTK3_la-pltmenu.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-pltmenu.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-pltmenu.Tpo -c -o ddb_gui_GTK3_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-pltmenu.Tpo $(DEPDIR)/ddb_gui_GTK3_la-pltmenu.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pltmenu.c' object='ddb_gui_GTK3_la-pltmenu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
 
 ddb_gui_GTK3_la-ctmapping.lo: ctmapping.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ctmapping.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ctmapping.Tpo -c -o ddb_gui_GTK3_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ctmapping.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ctmapping.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ctmapping.c' object='ddb_gui_GTK3_la-ctmapping.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ctmapping.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ctmapping.Tpo -c -o ddb_gui_GTK3_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ctmapping.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ctmapping.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctmapping.c' object='ddb_gui_GTK3_la-ctmapping.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
 
 ddb_gui_GTK3_la-namedicons.lo: namedicons.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-namedicons.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-namedicons.Tpo -c -o ddb_gui_GTK3_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-namedicons.Tpo $(DEPDIR)/ddb_gui_GTK3_la-namedicons.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='namedicons.c' object='ddb_gui_GTK3_la-namedicons.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-namedicons.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-namedicons.Tpo -c -o ddb_gui_GTK3_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-namedicons.Tpo $(DEPDIR)/ddb_gui_GTK3_la-namedicons.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='namedicons.c' object='ddb_gui_GTK3_la-namedicons.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+
+.m.o:
+ at am__fastdepOBJC_TRUE@	$(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepOBJC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepOBJC_FALSE@	$(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepOBJC_FALSE@	DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepOBJC_FALSE@	$(AM_V_OBJC at am__nodep@)$(OBJCCOMPILE) -c -o $@ $<
+
+.m.obj:
+ at am__fastdepOBJC_TRUE@	$(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepOBJC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepOBJC_FALSE@	$(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepOBJC_FALSE@	DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepOBJC_FALSE@	$(AM_V_OBJC at am__nodep@)$(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.m.lo:
+ at am__fastdepOBJC_TRUE@	$(AM_V_OBJC)$(LTOBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepOBJC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepOBJC_FALSE@	$(AM_V_OBJC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepOBJC_FALSE@	DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepOBJC_FALSE@	$(AM_V_OBJC at am__nodep@)$(LTOBJCCOMPILE) -c -o $@ $<
+
+ddb_gui_GTK3_la-retina.lo: retina.m
+ at am__fastdepOBJC_TRUE@	$(AM_V_OBJC)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_OBJCFLAGS) $(OBJCFLAGS) -MT ddb_gui_GTK3_la-retina.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-retina.Tpo -c -o ddb_gui_GTK3_la-retina.lo `test -f 'retina.m' || echo '$(srcdir)/'`retina.m
+ at am__fastdepOBJC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-retina.Tpo $(DEPDIR)/ddb_gui_GTK3_la-retina.Plo
+ at AMDEP_TRUE@@am__fastdepOBJC_FALSE@	$(AM_V_OBJC)source='retina.m' object='ddb_gui_GTK3_la-retina.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepOBJC_FALSE@	DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepOBJC_FALSE@	$(AM_V_OBJC at am__nodep@)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_OBJCFLAGS) $(OBJCFLAGS) -c -o ddb_gui_GTK3_la-retina.lo `test -f 'retina.m' || echo '$(srcdir)/'`retina.m
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1676,26 +1781,15 @@ uninstall-sdkHEADERS:
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(sdkdir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1707,15 +1801,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1724,6 +1814,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1868,20 +1973,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES uninstall-sdkHEADERS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-sdkHEADERS install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES \
-	uninstall-sdkHEADERS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-sdkHEADERS install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-pkglibLTLIBRARIES uninstall-sdkHEADERS
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/gtkui/actionhandlers.c b/plugins/gtkui/actionhandlers.c
index ade7434..99a658b 100644
--- a/plugins/gtkui/actionhandlers.c
+++ b/plugins/gtkui/actionhandlers.c
@@ -40,6 +40,9 @@
 #include "callbacks.h"
 #include <sys/stat.h>
 
+// disable custom title function, until we have new title formatting (0.7)
+#define DISABLE_CUSTOM_TITLE
+
 extern GtkWidget *mainwin;
 extern DB_functions_t *deadbeef;
 
@@ -390,9 +393,42 @@ action_hide_mainwin_handler (struct DB_plugin_action_s *action, int ctx) {
     return 0;
 }
 
+static void
+on_toggle_set_custom_title (GtkToggleButton *togglebutton, gpointer user_data) {
+    gboolean active = gtk_toggle_button_get_active (togglebutton);
+    deadbeef->conf_set_int ("gtkui.location_set_custom_title", active);
+
+    GtkWidget *ct = lookup_widget (GTK_WIDGET (user_data), "custom_title");
+    gtk_widget_set_sensitive (ct, active);
+
+    deadbeef->conf_save ();
+}
+
 gboolean
 action_add_location_handler_cb (void *user_data) {
     GtkWidget *dlg = create_addlocationdlg ();
+
+    GtkWidget *sct = lookup_widget (dlg, "set_custom_title");
+    GtkWidget *ct = lookup_widget (dlg, "custom_title");
+
+#ifndef DISABLE_CUSTOM_TITLE
+    if (deadbeef->conf_get_int ("gtkui.location_set_custom_title", 0)) {
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sct), TRUE);
+        gtk_widget_set_sensitive (ct, TRUE);
+    }
+    else
+#endif
+    {
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sct), FALSE);
+        gtk_widget_set_sensitive (ct, FALSE);
+    }
+
+#ifndef DISABLE_CUSTOM_TITLE
+    g_signal_connect ((gpointer) sct, "toggled",
+            G_CALLBACK (on_toggle_set_custom_title),
+            dlg);
+#endif
+
     gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
     int res = gtk_dialog_run (GTK_DIALOG (dlg));
     if (res == GTK_RESPONSE_OK) {
@@ -402,7 +438,16 @@ action_add_location_handler_cb (void *user_data) {
             if (text) {
                 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
                 if (!deadbeef->plt_add_files_begin (plt, 0)) {
-                    deadbeef->plt_add_file2 (0, plt, text, NULL, NULL);
+                    DB_playItem_t *tail = deadbeef->plt_get_last (plt, PL_MAIN);
+                    DB_playItem_t *it = deadbeef->plt_insert_file2 (0, plt, tail, text, NULL, NULL, NULL);
+#ifndef DISABLE_CUSTOM_TITLE
+                    if (it && deadbeef->conf_get_int ("gtkui.location_set_custom_title", 0)) {
+                        deadbeef->pl_replace_meta (it, ":CUSTOM_TITLE", gtk_entry_get_text (GTK_ENTRY (ct)));
+                    }
+#endif
+                    if (tail) {
+                        deadbeef->pl_item_unref (tail);
+                    }
                     deadbeef->plt_add_files_end (plt, 0);
                     playlist_refresh ();
                 }
@@ -662,13 +707,13 @@ load_playlist_thread (void *data) {
     char *fname = data;
     ddb_playlist_t *plt = deadbeef->plt_get_curr ();
     if (plt) {
-        deadbeef->plt_clear (plt);
-        int abort = 0;
-        DB_playItem_t *it = deadbeef->plt_load2 (0, plt, NULL, fname, &abort, NULL, NULL);
-        if (it) {
-            deadbeef->pl_item_unref (it);
+        if (!deadbeef->plt_add_files_begin (plt, 0)) {
+            deadbeef->plt_clear (plt);
+            int abort = 0;
+            DB_playItem_t *it = deadbeef->plt_load2 (0, plt, NULL, fname, &abort, NULL, NULL);
+            deadbeef->plt_save_config (plt);
+            deadbeef->plt_add_files_end (plt, 0);
         }
-        deadbeef->plt_save_config (plt);
         deadbeef->plt_unref (plt);
     }
     g_free (fname);
@@ -956,6 +1001,7 @@ action_hide_eq_handler(DB_plugin_action_t *act, int ctx) {
 gboolean
 action_playback_loop_off_handler_cb (void *data) {
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "loop_disable")), 1);
+    return FALSE;
 }
 
 int
@@ -967,6 +1013,7 @@ action_playback_loop_off_handler(DB_plugin_action_t *act, int ctx) {
 gboolean
 action_playback_loop_single_handler_cb (void *data) {
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "loop_single")), 1);
+    return FALSE;
 }
 
 int
@@ -978,6 +1025,7 @@ action_playback_loop_single_handler(DB_plugin_action_t *act, int ctx) {
 gboolean
 action_playback_loop_all_handler_cb (void *data) {
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "loop_all")), 1);
+    return FALSE;
 }
 
 int
@@ -989,6 +1037,7 @@ action_playback_loop_all_handler(DB_plugin_action_t *act, int ctx) {
 gboolean
 action_playback_order_random_handler_cb (void *data) {
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "order_random")), 1);
+    return FALSE;
 }
 
 int
@@ -1000,6 +1049,7 @@ action_playback_order_random_handler(DB_plugin_action_t *act, int ctx) {
 gboolean
 action_playback_order_shuffle_albums_handler_cb (void *data) {
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "order_shuffle_albums")), 1);
+    return FALSE;
 }
 
 int
@@ -1011,6 +1061,7 @@ action_playback_order_shuffle_albums_handler(DB_plugin_action_t *act, int ctx) {
 gboolean
 action_playback_order_shuffle_handler_cb (void *data) {
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "order_shuffle")), 1);
+    return FALSE;
 }
 
 int
@@ -1022,6 +1073,7 @@ action_playback_order_shuffle_handler(DB_plugin_action_t *act, int ctx) {
 gboolean
 action_playback_order_linear_handler_cb (void *data) {
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "order_linear")), 1);
+    return FALSE;
 }
 
 int
@@ -1047,6 +1099,7 @@ action_playback_order_cycle_handler_cb (void *data) {
         gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "order_linear")), 1);
         break;
     }
+    return FALSE;
 }
 
 int
@@ -1069,6 +1122,7 @@ action_playback_loop_cycle_handler_cb (void *data) {
         gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "loop_all")), 1);
         break;
     }
+    return FALSE;
 }
 
 int
diff --git a/plugins/gtkui/actions.c b/plugins/gtkui/actions.c
index 74a2175..fd18f31 100644
--- a/plugins/gtkui/actions.c
+++ b/plugins/gtkui/actions.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>,
         Viktor Semykin <thesame.ml at gmail.com>
 
diff --git a/plugins/gtkui/actions.h b/plugins/gtkui/actions.h
index e2c1f5a..64b9053 100644
--- a/plugins/gtkui/actions.h
+++ b/plugins/gtkui/actions.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>,
         Viktor Semykin <thesame.ml at gmail.com>
 
diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c
index 5a696bc..0f45d6f 100644
--- a/plugins/gtkui/callbacks.c
+++ b/plugins/gtkui/callbacks.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software: you can redistribute it and/or modify
@@ -119,6 +119,7 @@ void
 on_playbtn_clicked                     (GtkButton       *button,
                                         gpointer         user_data)
 {
+    // NOTE: this function is a copy of action_play_cb
     DB_output_t *output = deadbeef->get_output ();
     if (output->state () == OUTPUT_STATE_PAUSED) {
         ddb_playlist_t *plt = deadbeef->plt_get_curr ();
@@ -126,6 +127,7 @@ on_playbtn_clicked                     (GtkButton       *button,
         if (cur != -1) {
             ddb_playItem_t *it = deadbeef->plt_get_item_for_idx (plt, cur, PL_MAIN);
             ddb_playItem_t *it_playing = deadbeef->streamer_get_playing_track ();
+
             if (it) {
                 deadbeef->pl_item_unref (it);
             }
@@ -145,7 +147,16 @@ on_playbtn_clicked                     (GtkButton       *button,
         deadbeef->plt_unref (plt);
     }
     else {
-        deadbeef->sendmessage (DB_EV_PLAY_CURRENT, 0, 0, 0);
+        ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+        int cur = -1;
+        if (plt) {
+            cur = deadbeef->plt_get_cursor (plt, PL_MAIN);
+            deadbeef->plt_unref (plt);
+        }
+        if (cur == -1) {
+            cur = 0;
+        }
+        deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, cur, 0);
     }
 }
 
@@ -257,6 +268,7 @@ on_loop_all_activate                   (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
     deadbeef->conf_set_int ("playback.loop", 0);
+    deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
 }
 
 
@@ -265,6 +277,7 @@ on_loop_single_activate                (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
     deadbeef->conf_set_int ("playback.loop", 2);
+    deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
 }
 
 
@@ -273,6 +286,7 @@ on_loop_disable_activate               (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
     deadbeef->conf_set_int ("playback.loop", 1);
+    deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
 }
 
 void
@@ -311,6 +325,7 @@ on_scroll_follows_playback_activate    (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
     deadbeef->conf_set_int ("playlist.scroll.followplayback", gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem)));
+    deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
 }
 
 
@@ -454,7 +469,7 @@ on_toggle_status_bar_activate          (GtkMenuItem     *menuitem,
             gtk_widget_show (sb);
         }
     }
-    deadbeef->conf_save ();
+    deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
 }
 
 void
@@ -462,6 +477,15 @@ on_stop_after_current_activate         (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
     deadbeef->conf_set_int ("playlist.stop_after_current", gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem)));
+    deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+on_stop_after_album_activate           (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+    deadbeef->conf_set_int ("playlist.stop_after_album", gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem)));
+    deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
 }
 
 void
@@ -469,6 +493,7 @@ on_cursor_follows_playback_activate    (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
     deadbeef->conf_set_int ("playlist.scroll.cursorfollowplayback", gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem)));
+    deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
 }
 
 GtkWidget*
@@ -515,7 +540,7 @@ on_toggle_eq                           (GtkMenuItem     *menuitem,
         deadbeef->conf_set_int ("gtkui.eq.visible", 1);
         eq_window_show ();
     }
-    deadbeef->conf_save ();
+    deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
 }
 
 
@@ -557,99 +582,25 @@ on_new_playlist1_activate              (GtkMenuItem     *menuitem,
     action_new_playlist_handler_cb (NULL);
 }
 
-
-static GtkWidget *capture = NULL;
-
 gboolean
 on_mainwin_button_press_event          (GtkWidget       *widget,
                                         GdkEventButton  *event,
                                         gpointer         user_data)
 {
-    if (event->window != gtk_widget_get_window (mainwin)) {
-        return FALSE;
-    }
-    GtkWidget *volumebar = lookup_widget (mainwin, "volumebar");
-    GtkWidget *seekbar = lookup_widget (mainwin, "seekbar");
     GtkWidget *statusbar = lookup_widget (mainwin, "statusbar");
-    GtkAllocation a, b, c;
-    gtk_widget_get_allocation (volumebar, &a);
-    gtk_widget_get_allocation (seekbar, &b);
+    GtkAllocation c;
     gtk_widget_get_allocation (statusbar, &c);
-    if (event->x >= a.x && event->x < a.x + a.width
-            && event->y >= a.y && event->y < a.y + a.height) {
-        capture = volumebar;
-        return gtk_widget_event (volumebar, (GdkEvent *)event);
-    }
-    else if (event->x >= b.x && event->x < b.x + b.width
-            && event->y >= b.y && event->y < b.y + b.height) {
-        capture = seekbar;
-        return gtk_widget_event (seekbar, (GdkEvent *)event);
-    }
-    else if (event->x >= c.x && event->x < c.x + c.width
+    if (event->x >= c.x && event->x < c.x + c.width
             && event->y >= c.y && event->y < c.y + c.height) {
         if (event->type == GDK_2BUTTON_PRESS) {
             deadbeef->sendmessage (DB_EV_TRACKFOCUSCURRENT, 0, 0, 0);
         }
     }
 
-  return FALSE;
-}
-
-
-gboolean
-on_mainwin_button_release_event        (GtkWidget       *widget,
-                                        GdkEventButton  *event,
-                                        gpointer         user_data)
-{
-    if (capture) {
-        gboolean res = gtk_widget_event (capture, (GdkEvent *)event);
-        capture = NULL;
-        return res;
-    }
-
     return FALSE;
 }
 
 
-gboolean
-on_mainwin_scroll_event                (GtkWidget       *widget,
-                                        GdkEvent        *ev,
-                                        gpointer         user_data)
-{
-    GdkEventScroll *event = (GdkEventScroll *)ev;
-    if (event->window != gtk_widget_get_window (mainwin)) {
-        return FALSE;
-    }
-    GtkWidget *volumebar = lookup_widget (mainwin, "volumebar");
-    GtkWidget *seekbar = lookup_widget (mainwin, "seekbar");
-    GtkAllocation a;
-    gtk_widget_get_allocation (volumebar, &a);
-    GtkAllocation b;
-    gtk_widget_get_allocation (seekbar, &b);
-    if (event->x >= a.x && event->x < a.x + a.width
-            && event->y >= a.y && event->y < a.y + a.height) {
-        return gtk_widget_event (volumebar, (GdkEvent *)event);
-    }
-    else if (event->x >= b.x && event->x < b.x + b.width
-            && event->y >= b.y && event->y < b.y + b.height) {
-        return gtk_widget_event (seekbar, (GdkEvent *)event);
-    }
-  return FALSE;
-}
-
-
-gboolean
-on_mainwin_motion_notify_event         (GtkWidget       *widget,
-                                        GdkEventMotion  *event,
-                                        gpointer         user_data)
-{
-    if (capture) {
-        return gtk_widget_event (capture, (GdkEvent *)event);
-    }
-  return FALSE;
-}
-
-
 GtkWidget*
 create_seekbar (gchar *widget_name, gchar *string1, gchar *string2,
                 gint int1, gint int2)
@@ -683,7 +634,7 @@ GtkWidget*
 title_formatting_help_link_create (gchar *widget_name, gchar *string1, gchar *string2,
                 gint int1, gint int2)
 {
-    GtkWidget *link = gtk_link_button_new_with_label ("http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting", "Help");
+    GtkWidget *link = gtk_link_button_new_with_label ("http://github.com/Alexey-Yakovenko/deadbeef/wiki/Title-formatting", "Help");
     return link;
 }
 
diff --git a/plugins/gtkui/callbacks.h b/plugins/gtkui/callbacks.h
index b38d5f2..b5e1f5f 100644
--- a/plugins/gtkui/callbacks.h
+++ b/plugins/gtkui/callbacks.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software: you can redistribute it and/or modify
@@ -880,26 +880,6 @@ void
 on_wv_strip_id3v1_toggled              (GtkToggleButton *togglebutton,
                                         gpointer         user_data);
 
-gboolean
-on_mainwin_button_press_event          (GtkWidget       *widget,
-                                        GdkEventButton  *event,
-                                        gpointer         user_data);
-
-gboolean
-on_mainwin_button_release_event        (GtkWidget       *widget,
-                                        GdkEventButton  *event,
-                                        gpointer         user_data);
-
-gboolean
-on_mainwin_scroll_event                (GtkWidget       *widget,
-                                        GdkEvent        *event,
-                                        gpointer         user_data);
-
-gboolean
-on_mainwin_motion_notify_event         (GtkWidget       *widget,
-                                        GdkEventMotion  *event,
-                                        gpointer         user_data);
-
 GtkWidget*
 create_seekbar (gchar *widget_name, gchar *string1, gchar *string2,
                 gint int1, gint int2);
@@ -1308,3 +1288,20 @@ on_auto_size_columns_toggled           (GtkToggleButton *togglebutton,
 void
 on_searchentry_activate                (GtkEntry        *entry,
                                         gpointer         user_data);
+
+void
+on_stop_after_album_activate           (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_reset_autostopalbum_toggled         (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
+
+gboolean
+on_mainwin_button_press_event          (GtkWidget       *widget,
+                                        GdkEventButton  *event,
+                                        gpointer         user_data);
+
+void
+on_enable_shift_jis_recoding_toggled   (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
diff --git a/plugins/gtkui/coverart.c b/plugins/gtkui/coverart.c
index ecbb127..6953e99 100644
--- a/plugins/gtkui/coverart.c
+++ b/plugins/gtkui/coverart.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -43,6 +43,7 @@ GdkPixbuf *pixbuf_default;
 
 typedef struct {
     struct timeval tm;
+    time_t file_time;
     char *fname;
     int width;
     GdkPixbuf *pixbuf;
@@ -71,6 +72,8 @@ static uintptr_t tid;
 load_query_t *queue;
 load_query_t *tail;
 
+static int64_t artwork_reset_time;
+
 static void
 queue_add (const char *fname, int width, void (*callback) (void *user_data), void *user_data) {
     deadbeef->mutex_lock (mutex);
@@ -175,11 +178,14 @@ loading_thread (void *none) {
             }
             GdkPixbuf *pixbuf = NULL;
             GError *error = NULL;
-            pixbuf = gdk_pixbuf_new_from_file_at_scale (queue->fname, queue->width, queue->width, TRUE, &error);
-            if (error) {
-                //fprintf (stderr, "gdk_pixbuf_new_from_file_at_scale %s %d failed, error: %s\n", queue->fname, queue->width, error ? error->message : "n/a");
-                g_error_free (error);
-                error = NULL;
+            struct stat stat_buf;
+            if (!stat (queue->fname, &stat_buf)) {
+                pixbuf = gdk_pixbuf_new_from_file_at_scale (queue->fname, queue->width, queue->width, TRUE, &error);
+                if (error) {
+                    //fprintf (stderr, "gdk_pixbuf_new_from_file_at_scale %s %d failed, error: %s\n", queue->fname, queue->width, error ? error->message : "n/a");
+                    g_error_free (error);
+                    error = NULL;
+                }
             }
             if (!pixbuf) {
                 pixbuf = pixbuf_default;
@@ -189,6 +195,7 @@ loading_thread (void *none) {
                 deadbeef->mutex_lock (mutex);
                 cache[cache_min].pixbuf = pixbuf;
                 cache[cache_min].fname = strdup (queue->fname);
+                cache[cache_min].file_time  = stat_buf.st_mtime;
                 gettimeofday (&cache[cache_min].tm, NULL);
                 cache[cache_min].width = queue->width;
                 deadbeef->mutex_unlock (mutex);
@@ -272,7 +279,7 @@ get_cover_art_callb (const char *fname, const char *artist, const char *album, i
 
     if (width == -1) {
         char path[2048];
-        coverart_plugin->make_cache_path (path, sizeof (path), album, artist, -1);
+        coverart_plugin->make_cache_path2 (path, sizeof (path), fname, album, artist, -1);
         deadbeef->mutex_lock (mutex);
         int i_largest = -1;
         int size_largest = -1;
@@ -406,3 +413,26 @@ int
 gtkui_is_default_pixbuf (GdkPixbuf *pb) {
     return pb == pixbuf_default;
 }
+
+int
+gtkui_cover_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+    switch (id) {
+    case DB_EV_PLAYLIST_REFRESH:
+        {
+            int64_t reset_time = deadbeef->conf_get_int64 ("artwork.cache_reset_time", 0);;
+            if (reset_time != artwork_reset_time) {
+                artwork_reset_time = reset_time;
+                deadbeef->mutex_lock (mutex);
+                for (int i = 0; i < CACHE_SIZE; i++) {
+                    if (cache[i].pixbuf) {
+                        g_object_unref (cache[i].pixbuf);
+                    }
+                }
+                memset (cache, 0, sizeof (cache));
+                deadbeef->mutex_unlock (mutex);
+            }
+        }
+        break;
+    }
+    return 0;
+}
diff --git a/plugins/gtkui/coverart.h b/plugins/gtkui/coverart.h
index bacbfd9..9eb40e4 100644
--- a/plugins/gtkui/coverart.h
+++ b/plugins/gtkui/coverart.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -51,5 +51,8 @@ cover_get_default_pixbuf (void);
 int
 gtkui_is_default_pixbuf (GdkPixbuf *pb);
 
+int
+gtkui_cover_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2);
+
 #endif
 
diff --git a/plugins/gtkui/ddbcellrenderertextmultiline.c b/plugins/gtkui/ddbcellrenderertextmultiline.c
index 57d2f23..4ecfa04 100644
--- a/plugins/gtkui/ddbcellrenderertextmultiline.c
+++ b/plugins/gtkui/ddbcellrenderertextmultiline.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2010 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/ddbequalizer.c b/plugins/gtkui/ddbequalizer.c
index 0c8198b..ca441b1 100644
--- a/plugins/gtkui/ddbequalizer.c
+++ b/plugins/gtkui/ddbequalizer.c
@@ -77,8 +77,7 @@ GType ddb_equalizer_get_type (void);
 enum  {
 	DDB_EQUALIZER_DUMMY_PROPERTY
 };
-#define DDB_EQUALIZER_bands 18
-#define DDB_EQUALIZER_spot_size 3
+#define DDB_EQUALIZER_BANDS 18
 static gboolean ddb_equalizer_real_configure_event (GtkWidget* base, GdkEventConfigure* event);
 static void ddb_equalizer_real_realize (GtkWidget* base);
 #if !GTK_CHECK_VERSION(3,0,0)
@@ -170,11 +169,10 @@ static gboolean ddb_equalizer_real_draw (GtkWidget *widget, cairo_t *cr) {
     gdk_cairo_set_source_color (cr, &fore_dark_color);
 
     //drawing grid:
-    double step = (double)(width - self->priv->eq_margin_left) / (double)(DDB_EQUALIZER_bands+1);
+    double step = (double)(width - self->priv->eq_margin_left) / (double)(DDB_EQUALIZER_BANDS+1);
     int i;
-    for (i = 0; i < DDB_EQUALIZER_bands; i++)
+    for (i = 0; i < DDB_EQUALIZER_BANDS; i++)
     {
-        //does anyone know why this method is static?
         cairo_move_to (cr, (int)((i+1)*step)+self->priv->eq_margin_left, 0);
         cairo_line_to (cr, (int)((i+1)*step)+self->priv->eq_margin_left, height - self->priv->eq_margin_bottom);
     }
@@ -182,8 +180,11 @@ static gboolean ddb_equalizer_real_draw (GtkWidget *widget, cairo_t *cr) {
     double vstep = (double)(height-self->priv->eq_margin_bottom);
     for (double di=0; di < 2; di += 0.25)
     {
-        cairo_move_to (cr, self->priv->eq_margin_left, (int)((di-self->priv->preamp)*vstep));
-        cairo_line_to (cr, width, (int)((di-self->priv->preamp)*vstep));
+        int y = (int)((di-self->priv->preamp)*vstep);
+        if (y < alloc.height-self->priv->eq_margin_bottom) {
+            cairo_move_to (cr, self->priv->eq_margin_left, y);
+            cairo_line_to (cr, width, y);
+        }
     }
     cairo_stroke (cr);
 
@@ -200,7 +201,7 @@ static gboolean ddb_equalizer_real_draw (GtkWidget *widget, cairo_t *cr) {
 
     pango_font_description_set_size (fd, (int)(pango_font_description_get_size (st->font_desc) * 0.7));
     pango_context_set_font_description (pctx, fd);
-    for (i = 0; i < DDB_EQUALIZER_bands; i++)
+    for (i = 0; i < DDB_EQUALIZER_BANDS; i++)
     {
         cairo_save (cr);
         pango_layout_set_text (l, freqs[i], strlen (freqs[i]));
@@ -287,7 +288,7 @@ static gboolean ddb_equalizer_real_draw (GtkWidget *widget, cairo_t *cr) {
         bar_w = (int)step-1;
 
 
-    for (i = 0; i < DDB_EQUALIZER_bands; i++)
+    for (i = 0; i < DDB_EQUALIZER_BANDS; i++)
     {
         cairo_reset_clip (cr);
         cairo_rectangle (cr, (int)((i+1)*step)+self->priv->eq_margin_left - bar_w/2, (int)(self->priv->values[i] * (height-self->priv->eq_margin_bottom)), 11, height);
@@ -407,7 +408,7 @@ static void ddb_equalizer_update_eq_drag (DdbEqualizer* self, gdouble x, gdouble
 	gtk_widget_get_allocation ((GtkWidget*) self, &_tmp0_);
 	_tmp1_ = _tmp0_.width;
 	_tmp2_ = self->priv->eq_margin_left;
-	band_width = ((gdouble) (_tmp1_ - _tmp2_)) / ((gdouble) (DDB_EQUALIZER_bands + 1));
+	band_width = ((gdouble) (_tmp1_ - _tmp2_)) / ((gdouble) (DDB_EQUALIZER_BANDS + 1));
 	_tmp3_ = x;
 	_tmp4_ = self->priv->eq_margin_left;
 	_tmp5_ = band_width;
@@ -418,7 +419,7 @@ static void ddb_equalizer_update_eq_drag (DdbEqualizer* self, gdouble x, gdouble
 		band = 0;
 	}
 	_tmp8_ = band;
-	if (_tmp8_ >= DDB_EQUALIZER_bands) {
+	if (_tmp8_ >= DDB_EQUALIZER_BANDS) {
 		gint _tmp9_;
 		_tmp9_ = band;
 		band = _tmp9_ - 1;
@@ -427,7 +428,7 @@ static void ddb_equalizer_update_eq_drag (DdbEqualizer* self, gdouble x, gdouble
 	if (_tmp11_ >= 0) {
 		gint _tmp12_;
 		_tmp12_ = band;
-		_tmp10_ = _tmp12_ < DDB_EQUALIZER_bands;
+		_tmp10_ = _tmp12_ < DDB_EQUALIZER_BANDS;
 	} else {
 		_tmp10_ = FALSE;
 	}
@@ -808,9 +809,9 @@ static void ddb_equalizer_instance_init (DdbEqualizer * self) {
 	gdouble* _tmp0_ = NULL;
 	GdkCursor* _tmp1_;
 	self->priv = DDB_EQUALIZER_GET_PRIVATE (self);
-	_tmp0_ = g_new0 (gdouble, DDB_EQUALIZER_bands);
+	_tmp0_ = g_new0 (gdouble, DDB_EQUALIZER_BANDS);
 	self->priv->values = _tmp0_;
-	self->priv->values_length1 = DDB_EQUALIZER_bands;
+	self->priv->values_length1 = DDB_EQUALIZER_BANDS;
 	self->priv->_values_size_ = self->priv->values_length1;
 	self->priv->preamp = 0.5;
 	self->priv->mouse_y = -1;
diff --git a/plugins/gtkui/ddblistview.c b/plugins/gtkui/ddblistview.c
index 70fec5b..a79a5ab 100644
--- a/plugins/gtkui/ddblistview.c
+++ b/plugins/gtkui/ddblistview.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software: you can redistribute it and/or modify
@@ -79,6 +79,8 @@ static void ddb_listview_destroy(GObject *object);
 void
 ddb_listview_build_groups (DdbListview *listview);
 
+static void
+ddb_listview_resize_groups (DdbListview *listview);
 // fwd decls
 void
 ddb_listview_free_groups (DdbListview *listview);
@@ -94,6 +96,8 @@ ddb_listview_list_render_row_background (DdbListview *ps, cairo_t *cr, DdbListvi
 void
 ddb_listview_list_render_row_foreground (DdbListview *ps, cairo_t *cr, DdbListviewIter it, DdbListviewIter group_it, int even, int cursor, int group_y, int group_height, int group_pinned, int grp_next_y, int x, int y, int w, int h);
 void
+ddb_listview_list_render_album_art (DdbListview *ps, cairo_t *cr, DdbListviewIter it, DdbListviewIter group_it, int group_y, int group_height, int group_pinned, int grp_next_y, int x, int y, int w, int h);
+void
 ddb_listview_list_track_dragdrop (DdbListview *ps, int y);
 int
 ddb_listview_dragdrop_get_row_from_coord (DdbListview *listview, int y);
@@ -200,6 +204,9 @@ ddb_listview_list_button_press_event         (GtkWidget       *widget,
                                         gpointer         user_data);
 
 gboolean
+ddb_listview_list_popup_menu (GtkWidget *widget, gpointer user_data);
+
+gboolean
 ddb_listview_list_drag_motion                (GtkWidget       *widget,
                                         GdkDragContext  *drag_context,
                                         gint             x,
@@ -291,6 +298,9 @@ ddb_listview_init(DdbListview *listview)
     listview->col_movepos = -1;
     listview->drag_motion_y = -1;
 
+    listview->ref_point = -1;
+    listview->ref_point_offset = -1;
+
     listview->scroll_mode = 0;
     listview->scroll_pointer_y = -1;
     listview->scroll_direction = 0;
@@ -439,6 +449,9 @@ ddb_listview_init(DdbListview *listview)
     g_signal_connect_after ((gpointer) listview->list, "button_press_event",
             G_CALLBACK (ddb_listview_list_button_press_event),
             NULL);
+    g_signal_connect ((gpointer) listview->list, "popup_menu",
+            G_CALLBACK (ddb_listview_list_popup_menu),
+            NULL);
     g_signal_connect ((gpointer) listview->list, "scroll_event",
             G_CALLBACK (ddb_listview_vscroll_event),
             NULL);
@@ -602,6 +615,44 @@ ddb_listview_groupcheck (DdbListview *listview) {
     }
 }
 
+// returns 1 if X coordinate in list belongs to album art column and 0 if not
+int
+ddb_listview_is_album_art_column (DdbListview *listview, int x)
+{
+    int album_art_column = 0;
+    int col_x = -listview->hscrollpos;
+    int cnt = ddb_listview_column_get_count (listview);
+    for (int i = 0; i < cnt, col_x <= x; i++) {
+        const char *title;
+        int width;
+        int align_right;
+        col_info_t *info;
+        int minheight;
+        int res = ddb_listview_column_get_info (listview, i, &title, &width, &align_right, &minheight, (void **)&info);
+        if (res != -1 && x <= col_x + width && info->id == DB_COLUMN_ALBUM_ART) {
+            return 1;
+        }
+        col_x += width;
+    }
+    return 0;
+}
+
+// returns 1 if column is album art column
+int
+ddb_listview_is_album_art_column_idx (DdbListview *listview, int cidx)
+{
+    const char *title;
+    int width;
+    int align_right;
+    col_info_t *info;
+    int minheight;
+    int res = ddb_listview_column_get_info (listview, cidx, &title, &width, &align_right, &minheight, (void **)&info);
+    if (res != -1 && info->id == DB_COLUMN_ALBUM_ART) {
+        return 1;
+    }
+    return 0;
+}
+
 // returns Y coordinate of an item by its index
 int
 ddb_listview_get_row_pos (DdbListview *listview, int row_idx) {
@@ -642,7 +693,7 @@ ddb_listview_list_pickpoint_y (DdbListview *listview, int y, DdbListviewGroup **
             y -= grp_y;
             if (y < listview->grouptitle_height) {
                 *group_idx = -1;
-                *global_idx = -1;
+                *global_idx = idx;
             }
             else if (y >= listview->grouptitle_height + grp->num_items * listview->rowheight) {
                 *group_idx = (y - listview->grouptitle_height) / listview->rowheight;
@@ -712,9 +763,10 @@ ddb_listview_list_render (DdbListview *listview, cairo_t *cr, int x, int y, int
 
     int ii = 0;
     while (grp && grp_y < y + h + listview->scrollpos) {
+        int grp_height = listview->grouptitle_height + grp->num_items * listview->rowheight;
         // render title
         DdbListviewIter it = grp->head;
-        int grpheight = grp->height;
+        int grp_height_total = grp->height;
         int pushback = 0;
         int group_idx = idx;
 
@@ -729,23 +781,24 @@ ddb_listview_list_render (DdbListview *listview, cairo_t *cr, int x, int y, int
             }
         }
 
+        grp_next_y = grp_y + grp_height_total;
         for (int i = 0; i < grp->num_items; i++) {
             ii++;
-            if (grp_y + listview->grouptitle_height + i * listview->rowheight >= y + h + listview->scrollpos) {
+            int grp_row_y = grp_y + listview->grouptitle_height + i * listview->rowheight;
+            if (grp_row_y >= y + h + listview->scrollpos) {
                 break;
             }
-            grp_next_y = grp_y + grpheight;
             if (grp->pinned == 1 && gtkui_groups_pinned && grp_next_y - listview->scrollpos <= listview->grouptitle_height) {
                 pushback = listview->grouptitle_height - (grp_next_y - listview->scrollpos);
             }
             if (grp_y + listview->grouptitle_height + (i+1) * listview->rowheight >= y + listview->scrollpos
-                    && grp_y + listview->grouptitle_height + i * listview->rowheight < y + h + listview->scrollpos) {
+                    && grp_row_y < y + h + listview->scrollpos) {
                 GtkStyle *st = gtk_widget_get_style (listview->list);
                 gdk_cairo_set_source_color (cr, &st->bg[GTK_STATE_NORMAL]);
-                cairo_rectangle (cr, -listview->hscrollpos, grp_y + listview->grouptitle_height + i * listview->rowheight - listview->scrollpos, listview->totalwidth, listview->rowheight);
+                cairo_rectangle (cr, -listview->hscrollpos, grp_row_y - listview->scrollpos, listview->totalwidth, listview->rowheight);
                 cairo_fill (cr);
-                ddb_listview_list_render_row_background (listview, cr, it, (idx + 1 + i) & 1, (abs_idx+i) == listview->binding->cursor () ? 1 : 0, -listview->hscrollpos, grp_y + listview->grouptitle_height + i * listview->rowheight - listview->scrollpos, listview->totalwidth, listview->rowheight);
-                ddb_listview_list_render_row_foreground (listview, cr, it, grp->head, (idx + 1 + i) & 1, (idx+i) == listview->binding->cursor () ? 1 : 0, i * listview->rowheight, grp->height, grp->pinned, grp_next_y - listview->scrollpos, -listview->hscrollpos, grp_y + listview->grouptitle_height + i * listview->rowheight - listview->scrollpos, listview->totalwidth, listview->rowheight);
+                ddb_listview_list_render_row_background (listview, cr, it, (idx + 1 + i) & 1, (abs_idx+i) == listview->binding->cursor () ? 1 : 0, -listview->hscrollpos, grp_row_y - listview->scrollpos, listview->totalwidth, listview->rowheight);
+                ddb_listview_list_render_row_foreground (listview, cr, it, grp->head, (idx + 1 + i) & 1, (idx+i) == listview->binding->cursor () ? 1 : 0, i * listview->rowheight, grp->height, grp->pinned, grp_next_y - listview->scrollpos, -listview->hscrollpos, grp_row_y - listview->scrollpos, listview->totalwidth, listview->rowheight);
             }
             DdbListviewIter next = listview->binding->next (it);
             listview->binding->unref (it);
@@ -754,49 +807,47 @@ ddb_listview_list_render (DdbListview *listview, cairo_t *cr, int x, int y, int
                 break; // sanity check, in case groups were not rebuilt yet
             }
         }
-        if (grp->pinned == 1 && gtkui_groups_pinned && y <= 0) {
-            ddb_listview_list_render_row_background (listview, cr, NULL, group_idx & 1, 0, -listview->hscrollpos, y, listview->totalwidth, listview->grouptitle_height);
-            if (listview->binding->draw_group_title && listview->grouptitle_height > 0) {
-                listview->binding->draw_group_title (listview, cr, grp->head, -listview->hscrollpos, y - pushback, listview->totalwidth, listview->grouptitle_height);
-            }
-        }
-
         idx += grp->num_items + 1;
         abs_idx += grp->num_items;
 
         DdbListviewIter prev = listview->binding->prev (it);
-        int filler = grpheight - (listview->grouptitle_height + listview->rowheight * grp->num_items);
+        int filler = grp_height_total - (grp_height);
         if (filler > 0) {
             int theming = !gtkui_override_listview_colors ();
             if (theming) {
 #if GTK_CHECK_VERSION(3,0,0)
-                gtk_paint_flat_box (gtk_widget_get_style (treeview), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, treeview, "cell_even_ruled", x, grp_y - listview->scrollpos + listview->grouptitle_height + listview->rowheight * grp->num_items, w, filler);
+                gtk_paint_flat_box (gtk_widget_get_style (treeview), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, treeview, "cell_even_ruled", x, grp_y - listview->scrollpos + grp_height, w, filler);
 #else
-                gtk_paint_flat_box (gtk_widget_get_style (treeview), gtk_widget_get_window (listview->list), GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, treeview, "cell_even_ruled", x, grp_y - listview->scrollpos + listview->grouptitle_height + listview->rowheight * grp->num_items, w, filler);
+                gtk_paint_flat_box (gtk_widget_get_style (treeview), gtk_widget_get_window (listview->list), GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, treeview, "cell_even_ruled", x, grp_y - listview->scrollpos + grp_height, w, filler);
 #endif
             }
             else {
                 GdkColor clr;
                 gtkui_get_listview_even_row_color (&clr);
                 gdk_cairo_set_source_color (cr, &clr);
-                cairo_rectangle (cr, x, grp_y - listview->scrollpos + listview->grouptitle_height + listview->rowheight * grp->num_items, w, filler);
+                cairo_rectangle (cr, x, grp_y - listview->scrollpos + grp_height, w, filler);
                 cairo_fill (cr);
             }
-            ddb_listview_list_render_row_foreground (listview, cr, NULL, grp->head, 0, 0, grp->num_items * listview->rowheight, grp->height, grp->pinned, grp_next_y - listview->scrollpos, -listview->hscrollpos, grp_y - listview->scrollpos + listview->grouptitle_height + listview->rowheight * grp->num_items, listview->totalwidth, filler);
-            if (grp->pinned == 1 && gtkui_groups_pinned && y <= 0) {
-                ddb_listview_list_render_row_background (listview, cr, NULL, group_idx & 1, 0, -listview->hscrollpos, y, listview->totalwidth, listview->grouptitle_height);
-                if (listview->binding->draw_group_title && listview->grouptitle_height > 0) {
-                    listview->binding->draw_group_title (listview, cr, prev, -listview->hscrollpos, y - pushback, listview->totalwidth, listview->grouptitle_height);
-                }
+            //ddb_listview_list_render_row_foreground (listview, cr, NULL, grp->head, 0, 0, grp->num_items * listview->rowheight, grp->height, grp->pinned, grp_next_y - listview->scrollpos, -listview->hscrollpos, grp_y - listview->scrollpos + grp_height, listview->totalwidth, filler);
+        }
+
+        // draw album art
+        ddb_listview_list_render_album_art (listview, cr, it, grp->head, 0, grp->height, grp->pinned, grp_next_y - listview->scrollpos, -listview->hscrollpos, grp_y + listview->grouptitle_height - listview->scrollpos, listview->totalwidth, grp_height_total);
+        // draw pinned group title
+        if (grp->pinned == 1 && gtkui_groups_pinned && y <= 0) {
+            ddb_listview_list_render_row_background (listview, cr, NULL, group_idx & 1, 0, -listview->hscrollpos, y, listview->totalwidth, listview->grouptitle_height);
+            if (listview->binding->draw_group_title && listview->grouptitle_height > 0) {
+                listview->binding->draw_group_title (listview, cr, grp->head, -listview->hscrollpos, y - pushback, listview->totalwidth, listview->grouptitle_height);
             }
         }
+
         if (prev) {
             listview->binding->unref (prev);
         }
         if (it) {
             listview->binding->unref (it);
         }
-        grp_y += grpheight;
+        grp_y += grp_height_total;
         if (grp->pinned == 1) {
             grp = grp->next;
             if (grp) {
@@ -1359,12 +1410,12 @@ ddb_listview_list_render_row_background (DdbListview *ps, cairo_t *cr, DdbListvi
 
 void
 ddb_listview_list_render_row_foreground (DdbListview *ps, cairo_t *cr, DdbListviewIter it, DdbListviewIter group_it, int even, int cursor, int group_y, int group_height, int group_pinned, int grp_next_y, int x, int y, int w, int h) {
-	int width, height;
-	GtkAllocation a;
-	gtk_widget_get_allocation (ps->list, &a);
-	width = a.width;
-	height = a.height;
-	if (it && ps->binding->is_selected (it)) {
+    int width, height;
+    GtkAllocation a;
+    gtk_widget_get_allocation (ps->list, &a);
+    width = a.width;
+    height = a.height;
+    if (it && ps->binding->is_selected (it)) {
         GdkColor *clr = &gtk_widget_get_style (theme_treeview)->fg[GTK_STATE_SELECTED];
         float rgb[3] = { clr->red/65535.f, clr->green/65535.f, clr->blue/65535.f };
         draw_set_fg_color (&ps->listctx, rgb);
@@ -1378,11 +1429,25 @@ ddb_listview_list_render_row_foreground (DdbListview *ps, cairo_t *cr, DdbListvi
     int cidx = 0;
     for (c = ps->columns; c; c = c->next, cidx++) {
         int cw = c->width;
-        ps->binding->draw_column_data (ps, cr, it, ps->grouptitle_height > 0 ? group_it : NULL, cidx, group_y, group_height, group_pinned, grp_next_y, x, y, cw, h);
+        if (!ddb_listview_is_album_art_column_idx (ps, cidx)) {
+            ps->binding->draw_column_data (ps, cr, it, ps->grouptitle_height > 0 ? group_it : NULL, cidx, group_y, group_height, group_pinned, grp_next_y, x, y, cw, h);
+        }
         x += cw;
     }
 }
 
+void
+ddb_listview_list_render_album_art (DdbListview *ps, cairo_t *cr, DdbListviewIter it, DdbListviewIter group_it, int group_y, int group_height, int group_pinned, int grp_next_y, int x, int y, int w, int h) {
+    DdbListviewColumn *c;
+    int cidx = 0;
+    for (c = ps->columns; c; c = c->next, cidx++) {
+        int cw = c->width;
+        if (ddb_listview_is_album_art_column_idx (ps, cidx)) {
+            ps->binding->draw_column_data (ps, cr, it, ps->grouptitle_height > 0 ? group_it : NULL, cidx, group_y, group_height, group_pinned, grp_next_y, x, y, cw, h);
+        }
+        x += cw;
+    }
+}
 
 void
 ddb_listview_header_expose (DdbListview *ps, cairo_t *cr, int x, int y, int w, int h) {
@@ -1428,7 +1493,11 @@ ddb_listview_click_selection (DdbListview *ps, int ex, int ey, DdbListviewGroup
     deadbeef->pl_lock ();
     ps->areaselect = 0;
     ddb_listview_groupcheck (ps);
-    if (sel == -1 && (!grp || (ey > ps->grouptitle_height && grp_index >= grp->num_items))) {
+
+    // clicked album art column?
+    int album_art_column = ddb_listview_is_album_art_column (ps, ex);
+
+    if (sel == -1 && !album_art_column && (!grp || (ey > ps->grouptitle_height && grp_index >= grp->num_items))) {
         // clicked empty space, deselect everything
         DdbListviewIter it;
         int idx = 0;
@@ -1443,7 +1512,7 @@ ddb_listview_click_selection (DdbListview *ps, int ex, int ey, DdbListviewGroup
             it = next;
         }
     }
-    else if ((sel == -1 && grp) || (ey <= ps->grouptitle_height && gtkui_groups_pinned)) {
+    else if ((sel != -1 && grp && grp_index == -1) || (ey <= ps->grouptitle_height && gtkui_groups_pinned) || album_art_column) {
         // clicked group title, select group
         DdbListviewIter it;
         int idx = 0;
@@ -1555,6 +1624,11 @@ ddb_listview_list_mouse1_pressed (DdbListview *ps, int state, int ex, int ey, Gd
 
     int prev = cursor;
     if (sel != -1) {
+        // pick 1st item in group in case album art column was clicked
+        if (ddb_listview_is_album_art_column (ps, ex) && grp_index != -1) {
+            sel -= grp_index;
+        }
+
         ps->binding->set_cursor (sel);
         DdbListviewIter it = ps->binding->get_for_idx (sel);
         if (it) {
@@ -1759,7 +1833,7 @@ ddb_listview_list_mousemove (DdbListview *ps, GdkEventMotion *ev, int ex, int ey
     deadbeef->pl_lock ();
     if (ps->dragwait) {
         GtkWidget *widget = ps->list;
-        if (gtk_drag_check_threshold (widget, ps->lastpos[0], ex, ps->lastpos[1], ey)) {
+        if (gtk_drag_check_threshold (widget, ps->lastpos[0], ps->lastpos[1], ex, ey)) {
             ps->dragwait = 0;
             ps->drag_source_playlist = deadbeef->plt_get_curr_idx ();
             GtkTargetEntry entry = {
@@ -2005,20 +2079,6 @@ ddb_listview_handle_keypress (DdbListview *ps, int keyval, int state) {
         cursor = 0;
         gtk_range_set_value (GTK_RANGE (range), gtk_adjustment_get_lower (adj));
     }
-    else if (keyval == GDK_Menu) {
-        DdbListviewIter it = ps->binding->head ();
-        while (it && !ps->binding->is_selected (it)) {
-            DdbListviewIter next = ps->binding->next (it);
-            ps->binding->unref (it);
-            it = next;
-        }
-        if (it) {
-            int sel = ps->binding->get_idx (it);
-            ps->binding->list_context_menu (ps, it, sel);
-            ps->binding->unref (it);
-        }
-        return TRUE;
-    }
     else {
         return FALSE;
     }
@@ -2086,6 +2146,23 @@ ddb_listview_handle_keypress (DdbListview *ps, int keyval, int state) {
     return TRUE;
 }
 
+gboolean
+ddb_listview_list_popup_menu (GtkWidget *widget, gpointer user_data) {
+    DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+    DdbListviewIter it = ps->binding->head ();
+    while (it && !ps->binding->is_selected (it)) {
+        DdbListviewIter next = ps->binding->next (it);
+        ps->binding->unref (it);
+        it = next;
+    }
+    if (it) {
+        int sel = ps->binding->get_idx (it);
+        ps->binding->list_context_menu (ps, it, sel);
+        ps->binding->unref (it);
+    }
+    return TRUE;
+}
+
 int
 ddb_listview_dragdrop_get_row_from_coord (DdbListview *listview, int y) {
     if (y == -1) {
@@ -2393,32 +2470,18 @@ ddb_listview_header_configure_event              (GtkWidget       *widget,
     gtk_widget_get_allocation (GTK_WIDGET (ps), &lva);
     int totalwidth = lva.width;
 
+    // col_autoresize flag indicates whether fwidth is valid
     if (!ps->lock_columns) {
         DdbListviewColumn *c;
-        if (ps->header_width != totalwidth && deadbeef->conf_get_int ("gtkui.autoresize_columns", 0)) {
-            if (!ps->col_autoresize) {
-                for (c = ps->columns; c; c = c->next) {
-                    c->fwidth = (float)c->width / (float)totalwidth;
+        if (deadbeef->conf_get_int ("gtkui.autoresize_columns", 0)) {
+            if (ps->header_width != totalwidth) {
+                if (!ps->col_autoresize) {
+                    for (c = ps->columns; c; c = c->next) {
+                        c->fwidth = (float)c->width / (float)totalwidth;
+                    }
+                    ps->col_autoresize = 1;
                 }
-                ps->col_autoresize = 1;
-            }
-            // use the fwidth
-            int changed = 0;
-            int i = 0;
-            for (c = ps->columns; c; c = c->next, i++) {
-                int newwidth = totalwidth * c->fwidth;
-                if (newwidth != c->width) {
-                    c->width = newwidth;
-                    changed = 1;
-                    ps->binding->column_size_changed (ps, i);
-                }               
-            }
-            if (changed) {
-                ps->binding->columns_changed (ps);
-            }
-        }
-        else {
-            if (ps->col_autoresize) {
+                // use the fwidth
                 int changed = 0;
                 int i = 0;
                 for (c = ps->columns; c; c = c->next, i++) {
@@ -2429,12 +2492,17 @@ ddb_listview_header_configure_event              (GtkWidget       *widget,
                         ps->binding->column_size_changed (ps, i);
                     }               
                 }
-                ps->col_autoresize = 0;
                 if (changed) {
                     ps->binding->columns_changed (ps);
                 }
             }
         }
+        else {
+            for (c = ps->columns; c; c = c->next) {
+                c->fwidth = (float)c->width / (float)totalwidth;
+            }
+            ps->col_autoresize = 1;
+        }
         ps->header_width = totalwidth;
     }
 
@@ -2444,20 +2512,9 @@ ddb_listview_header_configure_event              (GtkWidget       *widget,
 void
 ddb_listview_lock_columns (DdbListview *lv, gboolean lock) {
     lv->lock_columns = lock;
-    if (lock == 0) {
-        GtkAllocation a;
-        gtk_widget_get_allocation (GTK_WIDGET (lv), &a);
-        if (deadbeef->conf_get_int ("gtkui.autoresize_columns", 0)) {
-            DdbListviewColumn *c;
-            if (!lv->col_autoresize) {
-                for (c = lv->columns; c; c = c->next) {
-                    c->fwidth = (float)c->width / (float)a.width;
-                }
-                lv->col_autoresize = 1;
-            }
-        }
-        lv->header_width = a.width;
-    }
+
+    // NOTE: at this point, it's still not guaranteed that the allocation contains
+    // the final size, so we don't calc initial autoresize state here
 }
 
 
@@ -2550,7 +2607,7 @@ ddb_listview_header_motion_notify_event          (GtkWidget       *widget,
             c->fwidth = (float)c->width / ps->header_width;
         }
         if (c->minheight) {
-            ddb_listview_build_groups (ps);
+            ddb_listview_resize_groups (ps);
         }
         ps->block_redraw_on_scroll = 1;
         ddb_listview_list_setup_vscroll (ps);
@@ -2607,6 +2664,45 @@ ddb_listview_header_button_press_event           (GtkWidget       *widget,
     DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
 //    ps->active_column = ddb_listview_header_get_column_for_coord (ps, event->x);
     if (TEST_LEFT_CLICK (event)) {
+
+        ddb_listview_groupcheck (ps);
+        DdbListviewGroup *grp = ps->groups;
+        DdbListviewGroup *grp_next;
+
+        if (grp && ps->scrollpos > 0) {
+            int abs_idx = 0;
+            int grp_y = 0;
+
+            GtkAllocation a;
+            gtk_widget_get_allocation (ps->list, &a);
+            int cursor_pos = ddb_listview_get_row_pos (ps, ps->binding->cursor ());
+            ps->ref_point = 0;
+            ps->ref_point_offset = 0;
+
+            // find 1st group
+            while (grp && grp_y + grp->height < ps->scrollpos) {
+                grp_y += grp->height;
+                abs_idx += grp->num_items;
+                grp = grp->next;
+            }
+            // choose cursor_pos as anchor
+            if (ps->scrollpos < cursor_pos && cursor_pos < ps->scrollpos + a.height && cursor_pos < ps->fullheight) {
+                ps->ref_point = ps->binding->cursor ();
+                ps->ref_point_offset = cursor_pos - ps->scrollpos;
+            }
+            // choose first group as anchor
+            else if (ps->scrollpos < grp_y + ps-> grouptitle_height + (grp->num_items * ps->rowheight) && grp_y + ps-> grouptitle_height + (grp->num_items * ps->rowheight) < ps->scrollpos + a.height) {
+                ps->ref_point = abs_idx;
+                ps->ref_point_offset = (grp_y + ps->grouptitle_height) - ps->scrollpos;
+            }
+            // choose next group as anchor
+            else {
+                grp_y += grp->height;
+                abs_idx += grp->num_items;
+                ps->ref_point = abs_idx;
+                ps->ref_point_offset = (grp_y + ps->grouptitle_height) - ps->scrollpos;
+            }
+        }
         // start sizing/dragging
         ps->header_dragging = -1;
         ps->header_sizing = -1;
@@ -2688,7 +2784,7 @@ ddb_listview_header_button_release_event         (GtkWidget       *widget,
             DdbListviewColumn *c;
             for (c = ps->columns; c; c = c->next) {
                 int w = c->width;
-                if (event->x >= x + w - 2 && event->x <= x + w) {
+                if (event->x >= x + w - 4 && event->x <= x + w) {
                     gdk_window_set_cursor (gtk_widget_get_window (widget), ps->cursor_sz);
                     break;
                 }
@@ -3194,6 +3290,38 @@ ddb_listview_build_groups (DdbListview *listview) {
 }
 
 void
+ddb_listview_resize_groups (DdbListview *listview) {
+    deadbeef->pl_lock ();
+    int old_height = listview->fullheight;
+    int grp_height_old = 0;
+    listview->fullheight = 0;
+
+    int min_height= 0;
+    DdbListviewColumn *c;
+    for (c = listview->columns; c; c = c->next) {
+        if (c->minheight && c->width > min_height) {
+            min_height = c->width;
+        }
+    }
+
+    DdbListviewGroup *grp = listview->groups;
+    while (grp) {
+        grp->height = listview->grouptitle_height + grp->num_items * listview->rowheight;
+        if (grp->height - listview->grouptitle_height < min_height) {
+            grp_height_old = grp->height;
+            grp->height = min_height + listview->grouptitle_height;
+        }
+        listview->fullheight += grp->height;
+        grp = grp->next;
+    }
+
+    deadbeef->pl_unlock ();
+    if (old_height != listview->fullheight) {
+        ddb_listview_refresh (listview, DDB_REFRESH_VSCROLL);
+    }
+}
+
+void
 ddb_listview_set_vscroll (DdbListview *listview, int scroll) {
     GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (listview->scrollbar));
     gtk_range_set_value (GTK_RANGE (listview->scrollbar), scroll);
@@ -3216,7 +3344,9 @@ ddb_listview_clear_sort (DdbListview *listview) {
 gboolean
 ddb_listview_list_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data) {
     DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
-    return ddb_listview_handle_keypress (listview, event->keyval, event->state);
-
+    if (!ddb_listview_handle_keypress (listview, event->keyval, event->state)) {
+        return on_mainwin_key_press_event (widget, event, user_data);
+    }
+    return TRUE;
 }
 
diff --git a/plugins/gtkui/ddblistview.h b/plugins/gtkui/ddblistview.h
index 46ae86d..08d8c8b 100644
--- a/plugins/gtkui/ddblistview.h
+++ b/plugins/gtkui/ddblistview.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software: you can redistribute it and/or modify
@@ -38,6 +38,11 @@ G_BEGIN_DECLS
 #define DDB_IS_LISTVIEW_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), DDB_TYPE_LISTVIEW))
 #define DDB_LISTVIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DDB_TYPE_LISTVIEW, DdbListviewClass))
 
+typedef struct {
+    int id;
+    char *format;
+} col_info_t;
+
 typedef struct _DdbListview DdbListview;
 typedef struct _DdbListviewClass DdbListviewClass;
 
@@ -47,6 +52,7 @@ typedef void * DdbPlaylistHandle;
 struct _DdbListviewGroup {
     DdbListviewIter head;
     int32_t height;
+    int32_t min_height;
     int32_t num_items;
     int pinned;
     struct _DdbListviewGroup *next;
@@ -127,6 +133,9 @@ struct _DdbListview {
 
     int drag_motion_y;
 
+    int ref_point; // idx of anchor when columns are resized
+    int ref_point_offset; // y pixel-coordinate of anchor relative to view
+
     // scrolling
     int scroll_mode; // 0=select, 1=dragndrop
     int scroll_pointer_y;
@@ -289,6 +298,9 @@ ddb_listview_get_row_pos (DdbListview *listview, int row_idx);
 void
 ddb_listview_groupcheck (DdbListview *listview);
 
+int
+ddb_listview_is_album_art_column (DdbListview *listview, int x);
+
 G_END_DECLS
 
 #endif // __DDBLISTVIEW_H
diff --git a/plugins/gtkui/ddbseekbar.c b/plugins/gtkui/ddbseekbar.c
index 31740a2..397b0ae 100644
--- a/plugins/gtkui/ddbseekbar.c
+++ b/plugins/gtkui/ddbseekbar.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2010 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -52,7 +52,6 @@ static gboolean ddb_seekbar_real_button_press_event (GtkWidget* base, GdkEventBu
 static gboolean ddb_seekbar_real_button_release_event (GtkWidget* base, GdkEventButton* event);
 static gboolean ddb_seekbar_real_motion_notify_event (GtkWidget* base, GdkEventMotion* event);
 static gboolean ddb_seekbar_real_configure_event (GtkWidget* base, GdkEventConfigure* event);
-DdbSeekbar* ddb_seekbar_new (void);
 DdbSeekbar* ddb_seekbar_construct (GType object_type);
 static GObject * ddb_seekbar_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
 
@@ -158,8 +157,8 @@ DdbSeekbar* ddb_seekbar_construct (GType object_type) {
 }
 
 
-DdbSeekbar* ddb_seekbar_new (void) {
-	return ddb_seekbar_construct (DDB_TYPE_SEEKBAR);
+GtkWidget* ddb_seekbar_new (void) {
+	return GTK_WIDGET (ddb_seekbar_construct (DDB_TYPE_SEEKBAR));
 }
 
 
@@ -331,7 +330,7 @@ seekbar_draw (GtkWidget *widget, cairo_t *cr) {
     cairo_fill (cr);
     cairo_reset_clip (cr);
 
-    if ((self->seekbar_moving || self->seekbar_moved > 0.0) && trk) {
+    if (!gtkui_disable_seekbar_overlay && (self->seekbar_moving || self->seekbar_moved > 0.0) && trk) {
         float time = 0;
         float dur = deadbeef->pl_get_item_duration (trk);
 
@@ -439,23 +438,65 @@ on_seekbar_button_release_event        (GtkWidget       *widget,
     self->seekbar_moved = 1.0;
     DB_playItem_t *trk = deadbeef->streamer_get_playing_track ();
     if (trk) {
-        GtkAllocation a;
-        gtk_widget_get_allocation (widget, &a);
-        float time = (event->x - a.x) * deadbeef->pl_get_item_duration (trk) / (a.width);
-        if (time < 0) {
-            time = 0;
+        if (deadbeef->pl_get_item_duration (trk) >= 0) {
+            GtkAllocation a;
+            gtk_widget_get_allocation (widget, &a);
+            float time = (event->x - a.x) * deadbeef->pl_get_item_duration (trk) / (a.width);
+            if (time < 0) {
+                time = 0;
+            }
+            deadbeef->sendmessage (DB_EV_SEEK, 0, time * 1000, 0);
         }
-        deadbeef->sendmessage (DB_EV_SEEK, 0, time * 1000, 0);
         deadbeef->pl_item_unref (trk);
     }
     gtk_widget_queue_draw (widget);
     return FALSE;
 }
 
-void
-seekbar_redraw (void) {
-    GtkWidget *widget = lookup_widget (mainwin, "seekbar");
-    gtk_widget_queue_draw (widget);
+static gboolean
+on_evbox_button_press_event          (GtkWidget       *widget,
+                                        GdkEventButton  *event,
+                                        gpointer         user_data)
+{
+    return gtk_widget_event (GTK_WIDGET (user_data), (GdkEvent *)event);
 }
 
+static gboolean
+on_evbox_button_release_event        (GtkWidget       *widget,
+                                        GdkEventButton  *event,
+                                        gpointer         user_data)
+{
+    return gtk_widget_event (GTK_WIDGET (user_data), (GdkEvent *)event);
+}
+
+static gboolean
+on_evbox_motion_notify_event         (GtkWidget       *widget,
+                                        GdkEventMotion  *event,
+                                        gpointer         user_data)
+{
+    return gtk_widget_event (GTK_WIDGET (user_data), (GdkEvent *)event);
+}
+
+static gboolean
+on_evbox_scroll_event                (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data) {
+    return gtk_widget_event (GTK_WIDGET (user_data), (GdkEvent *)event);
+}
+
+void
+ddb_seekbar_init_signals (DdbSeekbar *sb, GtkWidget *evbox) {
+  g_signal_connect ((gpointer) evbox, "button_press_event",
+                    G_CALLBACK (on_evbox_button_press_event),
+                    sb);
+  g_signal_connect ((gpointer) evbox, "button_release_event",
+                    G_CALLBACK (on_evbox_button_release_event),
+                    sb);
+  g_signal_connect ((gpointer) evbox, "scroll_event",
+                    G_CALLBACK (on_evbox_scroll_event),
+                    sb);
+  g_signal_connect ((gpointer) evbox, "motion_notify_event",
+                    G_CALLBACK (on_evbox_motion_notify_event),
+                    sb);
+}
 
diff --git a/plugins/gtkui/ddbseekbar.h b/plugins/gtkui/ddbseekbar.h
index 7ce9005..b4e470b 100644
--- a/plugins/gtkui/ddbseekbar.h
+++ b/plugins/gtkui/ddbseekbar.h
@@ -34,10 +34,14 @@ struct _DdbSeekbarClass {
 };
 
 
-GType ddb_seekbar_get_type (void);
-DdbSeekbar* ddb_seekbar_new (void);
-DdbSeekbar* ddb_seekbar_construct (GType object_type);
+GType
+ddb_seekbar_get_type (void);
 
+GtkWidget*
+ddb_seekbar_new (void);
+
+void
+ddb_seekbar_init_signals (DdbSeekbar *sb, GtkWidget *evbox);
 
 G_END_DECLS
 
diff --git a/plugins/gtkui/ddbtabstrip.c b/plugins/gtkui/ddbtabstrip.c
index e347fc9..7004b5c 100644
--- a/plugins/gtkui/ddbtabstrip.c
+++ b/plugins/gtkui/ddbtabstrip.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -1065,30 +1065,8 @@ on_tabstrip_motion_notify_event          (GtkWidget       *widget,
             x += width - tab_overlap_size;
         }
         if (inspos >= 0 && inspos != ts->dragging) {
-            char str1[100];
-            char str2[100];
-            char strcursor1[100];
-            char strcursor2[100];
-            int pos1;
-            int pos2;
-            int cursor1;
-            int cursor2;
-            snprintf (str1, sizeof (str1), "playlist.scroll.%d", ts->dragging);
-            pos1 = deadbeef->conf_get_int (str1, 0);
-            snprintf (str2, sizeof (str2), "playlist.scroll.%d", inspos);
-            pos2 = deadbeef->conf_get_int (str2, 0);
-
-            snprintf (strcursor1, sizeof (strcursor1), "playlist.cursor.%d", ts->dragging);
-            cursor1 = deadbeef->conf_get_int (strcursor1, 0);
-            snprintf (strcursor2, sizeof (strcursor2), "playlist.cursor.%d", inspos);
-            cursor2 = deadbeef->conf_get_int (strcursor2, 0);
-
             deadbeef->plt_move (ts->dragging, inspos);
             tab_moved = 1;
-            deadbeef->conf_set_int (str1, pos2);
-            deadbeef->conf_set_int (str2, pos1);
-            deadbeef->conf_set_int (strcursor1, cursor2);
-            deadbeef->conf_set_int (strcursor2, cursor1);
             ts->dragging = inspos;
             deadbeef->conf_set_int ("playlist.current", ts->dragging);
         }
diff --git a/plugins/gtkui/ddbtabstrip.h b/plugins/gtkui/ddbtabstrip.h
index 652485c..9d7a673 100644
--- a/plugins/gtkui/ddbtabstrip.h
+++ b/plugins/gtkui/ddbtabstrip.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/ddbvolumebar.c b/plugins/gtkui/ddbvolumebar.c
index e56ca03..e8e9c36 100644
--- a/plugins/gtkui/ddbvolumebar.c
+++ b/plugins/gtkui/ddbvolumebar.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -266,17 +266,6 @@ on_volumebar_button_release_event      (GtkWidget       *widget,
   return FALSE;
 }
 
-void
-volumebar_notify_changed (void) {
-    GtkWidget *widget = lookup_widget (mainwin, "volumebar");
-    gtk_widget_queue_draw (widget);
-    char s[100];
-    int db = deadbeef->volume_get_db ();
-    snprintf (s, sizeof (s), "%s%ddB", db < 0 ? "" : "+", db);
-    gtk_widget_set_tooltip_text (widget, s);
-    gtk_widget_trigger_tooltip_query (widget);
-}
-
 gboolean
 on_volumebar_scroll_event              (GtkWidget       *widget,
                                         GdkEventScroll        *event)
@@ -296,7 +285,6 @@ on_volumebar_scroll_event              (GtkWidget       *widget,
         vol = -range;
     }
     deadbeef->volume_set_db (vol);
-    GtkWidget *volumebar = lookup_widget (mainwin, "volumebar");
     gtk_widget_queue_draw (widget);
     char s[100];
     int db = deadbeef->volume_get_db ();
@@ -311,3 +299,51 @@ on_volumebar_configure_event (GtkWidget *widget, GdkEventConfigure *event) {
     gtkui_init_theme_colors ();
     return FALSE;
 }
+
+static gboolean
+on_evbox_button_press_event          (GtkWidget       *widget,
+                                        GdkEventButton  *event,
+                                        gpointer         user_data)
+{
+    return gtk_widget_event (GTK_WIDGET (user_data), (GdkEvent *)event);
+}
+
+static gboolean
+on_evbox_button_release_event        (GtkWidget       *widget,
+                                        GdkEventButton  *event,
+                                        gpointer         user_data)
+{
+    return gtk_widget_event (GTK_WIDGET (user_data), (GdkEvent *)event);
+}
+
+static gboolean
+on_evbox_motion_notify_event         (GtkWidget       *widget,
+                                        GdkEventMotion  *event,
+                                        gpointer         user_data)
+{
+    return gtk_widget_event (GTK_WIDGET (user_data), (GdkEvent *)event);
+}
+
+static gboolean
+on_evbox_scroll_event                (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data) {
+    return gtk_widget_event (GTK_WIDGET (user_data), (GdkEvent *)event);
+}
+
+void
+ddb_volumebar_init_signals (DdbVolumeBar *vb, GtkWidget *evbox) {
+  g_signal_connect ((gpointer) evbox, "button_press_event",
+                    G_CALLBACK (on_evbox_button_press_event),
+                    vb);
+  g_signal_connect ((gpointer) evbox, "button_release_event",
+                    G_CALLBACK (on_evbox_button_release_event),
+                    vb);
+  g_signal_connect ((gpointer) evbox, "scroll_event",
+                    G_CALLBACK (on_evbox_scroll_event),
+                    vb);
+  g_signal_connect ((gpointer) evbox, "motion_notify_event",
+                    G_CALLBACK (on_evbox_motion_notify_event),
+                    vb);
+}
+
diff --git a/plugins/gtkui/ddbvolumebar.h b/plugins/gtkui/ddbvolumebar.h
index e8ef0a2..976be54 100644
--- a/plugins/gtkui/ddbvolumebar.h
+++ b/plugins/gtkui/ddbvolumebar.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -48,6 +48,9 @@ struct _DdbVolumeBarClass {
 GType ddb_volumebar_get_type(void) G_GNUC_CONST;
 GtkWidget * ddb_volumebar_new(void);
 
+void
+ddb_volumebar_init_signals (DdbVolumeBar *vb, GtkWidget *evbox);
+
 G_END_DECLS
 
 #endif // __DDBVOLUMEBAR_H
diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade
index 0d24342..6e6a9e9 100644
--- a/plugins/gtkui/deadbeef.glade
+++ b/plugins/gtkui/deadbeef.glade
@@ -27,10 +27,7 @@
   <signal name="configure_event" handler="on_mainwin_configure_event" last_modification_time="Sun, 23 Aug 2009 15:26:53 GMT"/>
   <signal name="window_state_event" handler="on_mainwin_window_state_event" last_modification_time="Wed, 09 Dec 2009 19:39:55 GMT"/>
   <signal name="realize" handler="on_mainwin_realize" last_modification_time="Wed, 10 Mar 2010 18:20:51 GMT"/>
-  <signal name="button_press_event" handler="on_mainwin_button_press_event" last_modification_time="Fri, 09 Apr 2010 19:24:24 GMT"/>
-  <signal name="button_release_event" handler="on_mainwin_button_release_event" last_modification_time="Fri, 09 Apr 2010 19:24:31 GMT"/>
-  <signal name="scroll_event" handler="on_mainwin_scroll_event" last_modification_time="Fri, 09 Apr 2010 19:24:39 GMT"/>
-  <signal name="motion_notify_event" handler="on_mainwin_motion_notify_event" last_modification_time="Fri, 09 Apr 2010 19:24:49 GMT"/>
+  <signal name="button_press_event" handler="on_mainwin_button_press_event" last_modification_time="Sun, 11 May 2014 16:38:17 GMT"/>
 
   <child>
     <widget class="GtkVBox" id="vbox1">
@@ -61,7 +58,7 @@
 		      <signal name="activate" handler="on_open_activate" last_modification_time="Sat, 04 Jul 2009 12:57:58 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image647">
+			<widget class="GtkImage" id="image663">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -88,7 +85,7 @@
 		      <signal name="activate" handler="on_add_files_activate" last_modification_time="Sat, 04 Jul 2009 13:04:01 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image648">
+			<widget class="GtkImage" id="image664">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-add</property>
 			  <property name="icon_size">1</property>
@@ -109,7 +106,7 @@
 		      <signal name="activate" handler="on_add_folders_activate" last_modification_time="Sun, 06 Sep 2009 17:51:40 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image649">
+			<widget class="GtkImage" id="image665">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-add</property>
 			  <property name="icon_size">1</property>
@@ -178,7 +175,7 @@
 		      <signal name="activate" handler="on_quit_activate" last_modification_time="Sat, 04 Jul 2009 12:57:58 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image650">
+			<widget class="GtkImage" id="image666">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-quit</property>
 			  <property name="icon_size">1</property>
@@ -212,7 +209,7 @@
 		      <signal name="activate" handler="on_clear1_activate" last_modification_time="Sun, 06 Sep 2009 18:30:03 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image651">
+			<widget class="GtkImage" id="image667">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-clear</property>
 			  <property name="icon_size">1</property>
@@ -269,7 +266,7 @@
 			      <signal name="activate" handler="on_remove1_activate" last_modification_time="Sun, 06 Sep 2009 18:30:03 GMT"/>
 
 			      <child internal-child="image">
-				<widget class="GtkImage" id="image652">
+				<widget class="GtkImage" id="image668">
 				  <property name="visible">True</property>
 				  <property name="stock">gtk-remove</property>
 				  <property name="icon_size">1</property>
@@ -575,7 +572,7 @@
 		  <child>
 		    <widget class="GtkCheckMenuItem" id="stop_after_current">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Stop after current</property>
+		      <property name="label" translatable="yes">Stop after current track</property>
 		      <property name="use_underline">True</property>
 		      <property name="active">False</property>
 		      <signal name="activate" handler="on_stop_after_current_activate" last_modification_time="Sun, 20 Dec 2009 13:32:19 GMT"/>
@@ -583,6 +580,16 @@
 		  </child>
 
 		  <child>
+		    <widget class="GtkCheckMenuItem" id="stop_after_album">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Stop after current album</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="activate" handler="on_stop_after_album_activate" last_modification_time="Thu, 01 May 2014 15:14:26 GMT"/>
+		    </widget>
+		  </child>
+
+		  <child>
 		    <widget class="GtkSeparatorMenuItem" id="separator11">
 		      <property name="visible">True</property>
 		    </widget>
@@ -618,7 +625,7 @@
 		      <signal name="activate" handler="on_help1_activate" last_modification_time="Tue, 08 Sep 2009 17:32:06 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image653">
+			<widget class="GtkImage" id="image669">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-help</property>
 			  <property name="icon_size">1</property>
@@ -678,7 +685,7 @@
 		      <signal name="activate" handler="on_about1_activate" last_modification_time="Sat, 04 Jul 2009 12:57:58 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image654">
+			<widget class="GtkImage" id="image670">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-about</property>
 			  <property name="icon_size">1</property>
@@ -699,7 +706,7 @@
 		      <signal name="activate" handler="on_translators1_activate" last_modification_time="Sun, 19 Sep 2010 13:38:07 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image655">
+			<widget class="GtkImage" id="image671">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-about</property>
 			  <property name="icon_size">1</property>
@@ -724,194 +731,6 @@
       </child>
 
       <child>
-	<widget class="GtkHBox" id="hbox2">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox3">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkButton" id="stopbtn">
-		  <property name="visible">True</property>
-		  <property name="relief">GTK_RELIEF_NONE</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_stopbtn_clicked" last_modification_time="Sun, 05 Jul 2009 10:48:41 GMT"/>
-
-		  <child>
-		    <widget class="GtkImage" id="image128">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-media-stop</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="playbtn">
-		  <property name="visible">True</property>
-		  <property name="relief">GTK_RELIEF_NONE</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_playbtn_clicked" last_modification_time="Sun, 05 Jul 2009 10:48:53 GMT"/>
-
-		  <child>
-		    <widget class="GtkImage" id="image2">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-media-play</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="pausebtn">
-		  <property name="visible">True</property>
-		  <property name="relief">GTK_RELIEF_NONE</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_pausebtn_clicked" last_modification_time="Sun, 05 Jul 2009 10:49:01 GMT"/>
-
-		  <child>
-		    <widget class="GtkImage" id="image3">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-media-pause</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="prevbtn">
-		  <property name="visible">True</property>
-		  <property name="relief">GTK_RELIEF_NONE</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_prevbtn_clicked" last_modification_time="Sun, 05 Jul 2009 10:49:08 GMT"/>
-
-		  <child>
-		    <widget class="GtkImage" id="image4">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-media-previous</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="nextbtn">
-		  <property name="visible">True</property>
-		  <property name="relief">GTK_RELIEF_NONE</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_nextbtn_clicked" last_modification_time="Sun, 05 Jul 2009 10:49:12 GMT"/>
-
-		  <child>
-		    <widget class="GtkImage" id="image5">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-media-next</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="Custom" id="seekbar">
-	      <property name="width_request">20</property>
-	      <property name="visible">True</property>
-	      <property name="creation_function">create_seekbar</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Fri, 09 Apr 2010 19:51:15 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">2</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="Custom" id="volumebar">
-	      <property name="width_request">70</property>
-	      <property name="visible">True</property>
-	      <property name="creation_function">create_volumebar_widget</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Thu, 18 Feb 2010 20:13:13 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">2</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
 	<widget class="GtkVBox" id="plugins_bottom_vbox">
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
@@ -962,7 +781,7 @@
   <signal name="delete_event" handler="gtk_widget_hide_on_delete" last_modification_time="Sat, 08 Aug 2009 23:03:33 GMT"/>
   <signal name="configure_event" handler="on_searchwin_configure_event" last_modification_time="Mon, 28 Dec 2009 19:24:44 GMT"/>
   <signal name="window_state_event" handler="on_searchwin_window_state_event" last_modification_time="Mon, 28 Dec 2009 19:26:50 GMT"/>
-  <signal name="key_press_event" handler="on_searchwin_key_press_event" after="yes" last_modification_time="Mon, 21 Oct 2013 21:53:35 GMT"/>
+  <signal name="key_press_event" handler="on_searchwin_key_press_event" last_modification_time="Mon, 21 Oct 2013 21:53:35 GMT"/>
 
   <child>
     <widget class="GtkVBox" id="vbox4">
@@ -1903,7 +1722,7 @@
   <property name="visible">True</property>
   <property name="title">editcolumndlg</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="window_position">GTK_WIN_POS_MOUSE</property>
   <property name="modal">True</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
@@ -3022,7 +2841,7 @@ Album</property>
 		<widget class="GtkCheckButton" id="reset_autostop">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Auto-reset "Stop after current"</property>
+		  <property name="label" translatable="yes">"Stop after current track" option will switch off after triggering</property>
 		  <property name="use_underline">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
 		  <property name="focus_on_click">True</property>
@@ -3037,6 +2856,26 @@ Album</property>
 		  <property name="fill">False</property>
 		</packing>
 	      </child>
+
+	      <child>
+		<widget class="GtkCheckButton" id="reset_autostopalbum">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">"Stop after current album" option will switch off after triggering</property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		  <property name="active">False</property>
+		  <property name="inconsistent">False</property>
+		  <property name="draw_indicator">True</property>
+		  <signal name="toggled" handler="on_reset_autostopalbum_toggled" last_modification_time="Thu, 01 May 2014 15:30:01 GMT"/>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="tab_expand">False</property>
@@ -3403,6 +3242,26 @@ Album</property>
 		  </child>
 
 		  <child>
+		    <widget class="GtkCheckButton" id="enable_shift_jis_recoding">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">Enable Japanese SHIFT-JIS detection and recoding</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		      <signal name="toggled" handler="on_enable_shift_jis_recoding_toggled" last_modification_time="Sat, 14 Jun 2014 10:01:09 GMT"/>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
 		    <widget class="GtkCheckButton" id="enable_cp1251_recoding">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
@@ -3747,7 +3606,7 @@ Album</property>
 		    <widget class="GtkCheckButton" id="hide_delete_from_disk">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Hide "Delete from disk" context menu item</property>
+		      <property name="label" translatable="yes">Hide "Remove From Disk" context menu item</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
@@ -6417,49 +6276,112 @@ if you don't press Apply.</property>
       </child>
 
       <child>
-	<widget class="GtkHBox" id="hbox34">
+	<widget class="GtkVBox" id="vbox45">
 	  <property name="border_width">12</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">8</property>
 
 	  <child>
-	    <widget class="GtkLabel" id="label41">
+	    <widget class="GtkHBox" id="hbox34">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">URL:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">8</property>
+
+	      <child>
+		<widget class="GtkLabel" id="label41">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">URL:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkEntry" id="addlocation_entry">
+		  <property name="width_request">297</property>
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="editable">True</property>
+		  <property name="visibility">True</property>
+		  <property name="max_length">0</property>
+		  <property name="text" translatable="yes"></property>
+		  <property name="has_frame">True</property>
+		  <property name="invisible_char">•</property>
+		  <property name="activates_default">True</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
 	    </packing>
 	  </child>
 
 	  <child>
-	    <widget class="GtkEntry" id="addlocation_entry">
-	      <property name="width_request">297</property>
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">•</property>
-	      <property name="activates_default">True</property>
+	    <widget class="GtkHBox" id="hbox122">
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">8</property>
+
+	      <child>
+		<widget class="GtkCheckButton" id="set_custom_title">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Set Custom Title</property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		  <property name="active">False</property>
+		  <property name="inconsistent">False</property>
+		  <property name="draw_indicator">True</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkEntry" id="custom_title">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="editable">True</property>
+		  <property name="visibility">True</property>
+		  <property name="max_length">0</property>
+		  <property name="text" translatable="yes"></property>
+		  <property name="has_frame">True</property>
+		  <property name="invisible_char">•</property>
+		  <property name="activates_default">False</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -8801,4 +8723,159 @@ Descending</property>
   </child>
 </widget>
 
+<widget class="GtkDialog" id="setcustomtitledlg">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Set Custom Title</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">True</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox16">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area15">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="cancelbutton11">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-6</property>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="okbutton11">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-ok</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-5</property>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkVBox" id="vbox46">
+	  <property name="border_width">12</property>
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">8</property>
+
+	  <child>
+	    <widget class="GtkTextView" id="textview2">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="editable">False</property>
+	      <property name="overwrite">False</property>
+	      <property name="accepts_tab">True</property>
+	      <property name="justification">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap_mode">GTK_WRAP_WORD</property>
+	      <property name="cursor_visible">False</property>
+	      <property name="pixels_above_lines">8</property>
+	      <property name="pixels_below_lines">8</property>
+	      <property name="pixels_inside_wrap">0</property>
+	      <property name="left_margin">8</property>
+	      <property name="right_margin">8</property>
+	      <property name="indent">0</property>
+	      <property name="text" translatable="yes">This dialog allows to set custom title for any track. This is most useful for radio stations. An option to set the custom title is also present in the "Add Location" dialog. The title itself is visible in columns displaying the "Artist" metadata field. It should look like "[custom] artist" if the Artist field is present, or just "custom" otherwise.</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkHBox" id="hbox123">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">8</property>
+
+	      <child>
+		<widget class="GtkCheckButton" id="set_custom_title">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Set Custom Title</property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		  <property name="active">False</property>
+		  <property name="inconsistent">False</property>
+		  <property name="draw_indicator">True</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkEntry" id="custom_title">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="editable">True</property>
+		  <property name="visibility">True</property>
+		  <property name="max_length">0</property>
+		  <property name="text" translatable="yes"></property>
+		  <property name="has_frame">True</property>
+		  <property name="invisible_char">•</property>
+		  <property name="activates_default">False</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>
diff --git a/plugins/gtkui/drawing.h b/plugins/gtkui/drawing.h
index 192b7a9..85a2f58 100644
--- a/plugins/gtkui/drawing.h
+++ b/plugins/gtkui/drawing.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/dspconfig.c b/plugins/gtkui/dspconfig.c
index 1fdbb79..a3521db 100644
--- a/plugins/gtkui/dspconfig.c
+++ b/plugins/gtkui/dspconfig.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/dspconfig.h b/plugins/gtkui/dspconfig.h
index 79dbf14..8e07c49 100644
--- a/plugins/gtkui/dspconfig.h
+++ b/plugins/gtkui/dspconfig.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/eq.c b/plugins/gtkui/eq.c
index 7ddd098..33e6546 100644
--- a/plugins/gtkui/eq.c
+++ b/plugins/gtkui/eq.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/eq.h b/plugins/gtkui/eq.h
index 4ad4620..433d938 100644
--- a/plugins/gtkui/eq.h
+++ b/plugins/gtkui/eq.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/fileman.c b/plugins/gtkui/fileman.c
index a62765a..7ae7100 100644
--- a/plugins/gtkui/fileman.c
+++ b/plugins/gtkui/fileman.c
@@ -113,7 +113,7 @@ open_files_worker (void *data) {
     deadbeef->pl_set_cursor (PL_MAIN, 0);
     deadbeef->conf_save ();
     deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
-    deadbeef->sendmessage (DB_EV_PLAY_CURRENT, 0, 1, 0);
+    deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, 0, 0);
 }
 
 void
@@ -204,7 +204,7 @@ gtkpl_add_fm_dropped_files (DB_playItem_t *drop_before, char *ptr, int length) {
             pe++;
         }
         if (pe - p < 4096 && pe - p > 7) {
-            char fname[(int)(pe - p)];
+            char fname[(int)(pe - p)+1];
             strcopy_special (fname, p, pe-p);
             //strncpy (fname, p, pe - p);
             //fname[pe - p] = 0;
diff --git a/plugins/gtkui/gdkdrawing.c b/plugins/gtkui/gdkdrawing.c
index 4c01558..7691201 100644
--- a/plugins/gtkui/gdkdrawing.c
+++ b/plugins/gtkui/gdkdrawing.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c
index dc6eeb1..17f1f9d 100644
--- a/plugins/gtkui/gtkui.c
+++ b/plugins/gtkui/gtkui.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -79,6 +79,10 @@ GtkWidget *traymenu;
 GtkWidget *theme_treeview;
 GtkWidget *theme_button;
 
+static int gtkui_accept_messages = 0;
+
+static gint refresh_timeout = 0;
+
 int fileadded_listener_id;
 int fileadd_beginend_listener_id;
 // overriden API methods
@@ -97,6 +101,9 @@ int gtkui_groups_pinned;
 int gtkui_is_retina = 0;
 #endif
 
+int gtkui_unicode_playstate = 0;
+int gtkui_disable_seekbar_overlay = 0;
+
 #define TRAY_ICON "deadbeef_tray_icon"
 
 // that must be called before gtk_init
@@ -109,7 +116,7 @@ gtkpl_init (void) {
     gtk_box_pack_start (GTK_BOX (vbox1), theme_treeview, FALSE, FALSE, 0);
     gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (theme_treeview), TRUE);
 
-    theme_button = lookup_widget (mainwin, "stopbtn");
+    theme_button = mainwin;//lookup_widget (mainwin, "stopbtn");
 }
 
 void
@@ -129,8 +136,6 @@ struct fromto_t {
 
 static gboolean
 update_win_title_idle (gpointer data);
-static gboolean
-redraw_seekbar_cb (gpointer nothing);
 
 // update status bar and window title
 static int sb_context_id = -1;
@@ -147,7 +152,6 @@ update_songinfo (gpointer ctx) {
     }
     DB_output_t *output = deadbeef->get_output ();
     char sbtext_new[512] = "-";
-    float songpos = last_songpos;
 
     float pl_totaltime = deadbeef->pl_get_totaltime ();
     int daystotal = (int)pl_totaltime / (3600*24);
@@ -173,7 +177,6 @@ update_songinfo (gpointer ctx) {
 
     if (!output || (output->state () == OUTPUT_STATE_STOPPED || !track || !c)) {
         snprintf (sbtext_new, sizeof (sbtext_new), _("Stopped | %d tracks | %s total playtime"), deadbeef->pl_getcount (PL_MAIN), totaltime_str);
-        songpos = 0;
     }
     else {
         float playpos = deadbeef->streamer_get_playpos ();
@@ -193,7 +196,6 @@ update_songinfo (gpointer ctx) {
         }
         int samplerate = c->fmt.samplerate;
         int bitspersample = c->fmt.bps;
-        songpos = playpos;
         //        codec_unlock ();
 
         char t[100];
@@ -238,18 +240,6 @@ update_songinfo (gpointer ctx) {
         gtk_statusbar_push (sb, sb_context_id, sb_text);
     }
 
-    if (mainwin) {
-        GtkWidget *widget = lookup_widget (mainwin, "seekbar");
-        // translate volume to seekbar pixels
-        songpos /= duration;
-        GtkAllocation a;
-        gtk_widget_get_allocation (widget, &a);
-        songpos *= a.width;
-        if (fabs (songpos - last_songpos) > 0.01) {
-            gtk_widget_queue_draw (widget);
-            last_songpos = songpos;
-        }
-    }
     if (track) {
         deadbeef->pl_item_unref (track);
     }
@@ -287,17 +277,6 @@ on_trayicon_scroll_event               (GtkWidget       *widget,
         vol = deadbeef->volume_get_min_db ();
     }
     deadbeef->volume_set_db (vol);
-    volumebar_redraw ();
-
-    //Update volume bar tooltip
-    if (mainwin) {
-        GtkWidget *volumebar = lookup_widget (mainwin, "volumebar");
-        char s[100];
-        int db = vol;
-        snprintf (s, sizeof (s), "%s%ddB", db < 0 ? "" : "+", db);
-        gtk_widget_set_tooltip_text (volumebar, s);
-        gtk_widget_trigger_tooltip_query (volumebar);
-    }
 
 #if 0
     char str[100];
@@ -412,7 +391,6 @@ gtkpl_songchanged_wrapper (DB_playItem_t *from, DB_playItem_t *to) {
         deadbeef->pl_item_ref (to);
     }
     g_idle_add (update_win_title_idle, ft);
-    g_idle_add (redraw_seekbar_cb, NULL);
     if (searchwin && gtk_widget_get_window (searchwin)) {
         int iconified = gdk_window_get_state(gtk_widget_get_window (searchwin)) & GDK_WINDOW_STATE_ICONIFIED;
         if (gtk_widget_get_visible (searchwin) && !iconified) {
@@ -506,13 +484,6 @@ gtkui_on_frameupdate (gpointer data) {
 }
 
 static gboolean
-gtkui_volumechanged_cb (gpointer ctx) {
-    GtkWidget *volumebar = lookup_widget (mainwin, "volumebar");
-    gdk_window_invalidate_rect (gtk_widget_get_window (volumebar), NULL, FALSE);
-    return FALSE;
-}
-
-static gboolean
 gtkui_update_status_icon (gpointer unused) {
     int hide_tray_icon = deadbeef->conf_get_int ("gtkui.hide_tray_icon", 0);
     if (hide_tray_icon && !trayicon) {
@@ -587,6 +558,19 @@ gtkui_get_curr_playlist_mod (void) {
     return res;
 }
 
+void
+gtkui_setup_gui_refresh (void) {
+    int tm = 1000/gtkui_get_gui_refresh_rate ();
+
+    if (refresh_timeout) {
+        g_source_remove (refresh_timeout);
+        refresh_timeout = 0;
+    }
+
+    refresh_timeout = g_timeout_add (tm, gtkui_on_frameupdate, NULL);
+}
+
+
 static gboolean
 gtkui_on_configchanged (void *data) {
     // order and looping
@@ -608,16 +592,32 @@ gtkui_on_configchanged (void *data) {
     // cursor follows playback
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "cursor_follows_playback")), deadbeef->conf_get_int ("playlist.scroll.cursorfollowplayback", 1) ? TRUE : FALSE);
 
-    // stop after current
+    // stop after current track
     int stop_after_current = deadbeef->conf_get_int ("playlist.stop_after_current", 0);
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "stop_after_current")), stop_after_current ? TRUE : FALSE);
 
+    // stop after current album
+    int stop_after_album = deadbeef->conf_get_int ("playlist.stop_after_album", 0);
+    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "stop_after_album")), stop_after_album ? TRUE : FALSE);
+
     // embolden current track
     gtkui_embolden_current_track = deadbeef->conf_get_int ("gtkui.embolden_current_track", 0);
 
+    // pin groups
+    gtkui_groups_pinned = deadbeef->conf_get_int ("playlist.pin.groups", 0);
+
+    // play state images
+    gtkui_unicode_playstate = deadbeef->conf_get_int ("gtkui.unicode_playstate", 0);
+
+    // seekbar overlay
+    gtkui_disable_seekbar_overlay = deadbeef->conf_get_int ("gtkui.disable_seekbar_overlay", 0);
+
     // tray icon
     gtkui_update_status_icon (NULL);
 
+    // statusbar refresh
+    gtkui_setup_gui_refresh ();
+
     return FALSE;
 }
 
@@ -685,16 +685,6 @@ update_win_title_idle (gpointer data) {
     return FALSE;
 }
 
-static gboolean
-redraw_seekbar_cb (gpointer nothing) {
-    int iconified = gdk_window_get_state(gtk_widget_get_window(mainwin)) & GDK_WINDOW_STATE_ICONIFIED;
-    if (!gtk_widget_get_visible (mainwin) || iconified) {
-        return FALSE;
-    }
-    seekbar_redraw ();
-    return FALSE;
-}
-
 int
 gtkui_add_new_playlist (void) {
     int cnt = deadbeef->plt_get_count ();
@@ -727,22 +717,8 @@ gtkui_add_new_playlist (void) {
     return -1;
 }
 
-void
-volumebar_redraw (void) {
-    GtkWidget *volumebar = lookup_widget (mainwin, "volumebar");
-    gdk_window_invalidate_rect (gtk_widget_get_window (volumebar), NULL, FALSE);
-}
-
-//void
-//tabstrip_redraw (void) {
-//    GtkWidget *ts = lookup_widget (mainwin, "tabstrip");
-//    ddb_tabstrip_refresh (DDB_TABSTRIP (ts));
-//}
-
-static gint refresh_timeout = 0;
-
-void
-gtkui_setup_gui_refresh (void) {
+int
+gtkui_get_gui_refresh_rate () {
     int fps = deadbeef->conf_get_int ("gtkui.refresh_rate", 10);
     if (fps < 1) {
         fps = 1;
@@ -750,15 +726,7 @@ gtkui_setup_gui_refresh (void) {
     else if (fps > 30) {
         fps = 30;
     }
-
-    int tm = 1000/fps;
-
-    if (refresh_timeout) {
-        g_source_remove (refresh_timeout);
-        refresh_timeout = 0;
-    }
-
-    refresh_timeout = g_timeout_add (tm, gtkui_on_frameupdate, NULL);
+    return fps;
 }
 
 static void
@@ -777,7 +745,7 @@ add_mainmenu_actions_cb (void *data) {
     return FALSE;
 }
 
-void
+int
 gtkui_thread (void *ctx);
 
 int
@@ -797,10 +765,14 @@ gtkui_plt_load (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, in
 
 int
 gtkui_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+    if (!gtkui_accept_messages) {
+        return -1;
+    }
     ddb_gtkui_widget_t *rootwidget = w_get_rootwidget ();
     if (rootwidget) {
         send_messages_to_widgets (rootwidget, id, ctx, p1, p2);
     }
+    gtkui_cover_message (id, ctx, p1, p2);
     switch (id) {
     case DB_EV_ACTIVATED:
         g_idle_add (activate_cb, NULL);
@@ -826,12 +798,8 @@ gtkui_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
     case DB_EV_PLAYLISTCHANGED:
         g_idle_add (playlistchanged_cb, NULL);
         break;
-    case DB_EV_VOLUMECHANGED:
-        g_idle_add (gtkui_volumechanged_cb, NULL);
-        break;
     case DB_EV_CONFIGCHANGED:
         g_idle_add (gtkui_on_configchanged, NULL);
-        gtkui_groups_pinned = deadbeef->conf_get_int ("playlist.pin.groups",0);
         break;
     case DB_EV_OUTPUTCHANGED:
         g_idle_add (outputchanged_cb, NULL);
@@ -849,6 +817,8 @@ gtkui_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
     return 0;
 }
 
+static const char gtkui_def_layout[] = "vbox expand=\"0 1\" fill=\"1 1\" homogeneous=0 {hbox expand=\"0 1 0\" fill=\"1 1 1\" homogeneous=0 {playtb {} seekbar {} volumebar {} } tabbed_playlist hideheaders=0 {} } ";
+
 static void
 init_widget_layout (void) {
     w_init ();
@@ -857,8 +827,27 @@ init_widget_layout (void) {
     gtk_box_pack_start (GTK_BOX(lookup_widget(mainwin, "plugins_bottom_vbox")), rootwidget->widget, TRUE, TRUE, 0);
 
     // load layout
+    // config var name is defined in DDB_GTKUI_CONF_LAYOUT
+    // gtkui.layout: 0.6.0 and 0.6.1
+    // gtkui.layout.major.minor.point: later versions
+
     char layout[20000];
-    deadbeef->conf_get_str ("gtkui.layout", "tabbed_playlist \"\" { }", layout, sizeof (layout));
+    deadbeef->conf_get_str (DDB_GTKUI_CONF_LAYOUT, "-", layout, sizeof (layout));
+    if (!strcmp (layout, "-")) {
+        // upgrade from 0.6.0 to 0.6.2
+        char layout_060[20000];
+        deadbeef->conf_get_str ("gtkui.layout", "-", layout_060, sizeof (layout_060));
+        if (!strcmp (layout_060, "-")) {
+            // new setup
+            strcpy (layout, gtkui_def_layout);
+        }
+        else {
+            // upgrade with top bar
+            snprintf (layout, sizeof (layout), "vbox expand=\"0 1\" fill=\"1 1\" homogeneous=0 {hbox expand=\"0 1 0\" fill=\"1 1 1\" homogeneous=0 {playtb {} seekbar {} volumebar {} } %s }", layout_060);
+            deadbeef->conf_set_str (DDB_GTKUI_CONF_LAYOUT, layout);
+            deadbeef->conf_save ();
+        }
+    }
 
     ddb_gtkui_widget_t *w = NULL;
     w_create_from_string (layout, &w);
@@ -895,7 +884,7 @@ gtkui_connect_cb (void *none) {
     DB_plugin_t **plugins = deadbeef->plug_get_list ();
     for (int i = 0; plugins[i]; i++) {
         DB_plugin_t *p = plugins[i];
-        if (p->id && !strcmp (p->id, "artwork")) {
+        if (p->id && !strcmp (p->id, "artwork") && p->version_major == 1 && p->version_minor >= 2) {
             trace ("gtkui: found cover-art loader plugin\n");
             coverart_plugin = (DB_artwork_plugin_t *)p;
             break;
@@ -935,18 +924,11 @@ gtkui_add_file_end_cb (ddb_fileadd_data_t *data, void *user_data) {
     }
 }
 
-void
+int
 gtkui_thread (void *ctx) {
 #ifdef __linux__
     prctl (PR_SET_NAME, "deadbeef-gtkui", 0, 0, 0, 0);
 #endif
-#ifndef __APPLE__
-    XInitThreads (); // gtkglext/xcb doesn't work without this
-#endif
-    // let's start some gtk
-    g_thread_init (NULL);
-    add_pixmap_directory (deadbeef->get_pixmap_dir ());
-    gdk_threads_init ();
 
     int argc = 2;
     const char **argv = alloca (sizeof (char *) * argc);
@@ -958,7 +940,16 @@ gtkui_thread (void *ctx) {
     }
 
     gtk_disable_setlocale ();
+    add_pixmap_directory (deadbeef->get_pixmap_dir ());
 
+    // let's start some gtk
+    g_thread_init (NULL);
+#ifndef __FreeBSD__
+    // this call makes gtk_main hang on freebsd for unknown reason
+    // however, if we don't have this call, deadbeef will crash randomly on
+    // gentoo linux
+    gdk_threads_init ();
+#endif
     gtk_init (&argc, (char ***)&argv);
 
     // register widget types
@@ -978,21 +969,13 @@ gtkui_thread (void *ctx) {
     w_reg_widget (_("HBox"), 0, w_hbox_create, "hbox", NULL);
     w_reg_widget (_("VBox"), 0, w_vbox_create, "vbox", NULL);
     w_reg_widget (_("Button"), 0, w_button_create, "button", NULL);
+    w_reg_widget (_("Seekbar"), 0, w_seekbar_create, "seekbar", NULL);
+    w_reg_widget (_("Playback controls"), 0, w_playtb_create, "playtb", NULL);
+    w_reg_widget (_("Volume bar"), 0, w_volumebar_create, "volumebar", NULL);
+    w_reg_widget (_("Chiptune voices"), 0, w_ctvoices_create, "ctvoices", NULL);
 
     mainwin = create_mainwin ();
 
-    // gtk adds default keybindings to GtkWindow, remove them
-    GtkBindingSet *binding_set = gtk_binding_set_by_class (GTK_WINDOW_GET_CLASS(mainwin));
-    gtk_binding_entry_remove (binding_set, GDK_space, 0);
-    gtk_binding_entry_remove (binding_set, GDK_KP_Space, 0);
-    gtk_binding_entry_remove (binding_set, GDK_Return, 0);
-    gtk_binding_entry_remove (binding_set, GDK_ISO_Enter, 0);
-    gtk_binding_entry_remove (binding_set, GDK_KP_Enter, 0);
-    gtk_binding_entry_remove (binding_set, GDK_Tab, GDK_CONTROL_MASK);
-    gtk_binding_entry_remove (binding_set, GDK_Tab, GDK_CONTROL_MASK|GDK_SHIFT_MASK);
-    gtk_binding_entry_remove (binding_set, GDK_KP_Tab, GDK_CONTROL_MASK);
-    gtk_binding_entry_remove (binding_set, GDK_KP_Tab, GDK_CONTROL_MASK|GDK_SHIFT_MASK);
-
     // initialize default hotkey mapping
     if (!deadbeef->conf_get_int ("hotkeys_created", 0)) {
         // check if any hotkeys were created manually (e.g. beta versions of 0.6)
@@ -1070,8 +1053,6 @@ gtkui_thread (void *ctx) {
 
     init_widget_layout ();
 
-    gtkui_setup_gui_refresh ();
-
     char fmt[500];
     char str[600];
     deadbeef->conf_get_str ("gtkui.titlebar_stopped", "DeaDBeeF-%V", fmt, sizeof (fmt));
@@ -1084,6 +1065,8 @@ gtkui_thread (void *ctx) {
     supereq_plugin = deadbeef->plug_get_for_id ("supereq");
 
     gtkui_connect_cb (NULL);
+
+    gtkui_accept_messages = 1;
     deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
 
 #ifdef __APPLE__
@@ -1117,6 +1100,7 @@ gtkui_thread (void *ctx) {
         gtk_widget_destroy (searchwin);
         searchwin = NULL;
     }
+    return 0;
 }
 
 gboolean
@@ -1184,7 +1168,7 @@ gtkui_show_info_window (const char *fname, const char *title, GtkWidget **pwindo
 gboolean
 gtkui_quit_cb (void *ctx) {
     if (deadbeef->have_background_jobs ()) {
-        GtkWidget *dlg = gtk_message_dialog_new (GTK_WINDOW (mainwin), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, _("The player is currently running backgroud tasks. If you quit now, the tasks will be cancelled or interrupted. This may result in data loss."));
+        GtkWidget *dlg = gtk_message_dialog_new (GTK_WINDOW (mainwin), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, _("The player is currently running background tasks. If you quit now, the tasks will be cancelled or interrupted. This may result in data loss."));
         gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (mainwin));
         gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), _("Do you still want to quit?"));
         gtk_window_set_title (GTK_WINDOW (dlg), _("Warning"));
@@ -1194,9 +1178,14 @@ gtkui_quit_cb (void *ctx) {
         if (response != GTK_RESPONSE_YES) {
             return FALSE;
         }
+        else {
+            exit (0);
+        }
+    }
+    else {
+        progress_abort ();
+        deadbeef->sendmessage (DB_EV_TERMINATE, 0, 0, 0);
     }
-    progress_abort ();
-    deadbeef->sendmessage (DB_EV_TERMINATE, 0, 0, 0);
     return FALSE;
 }
 
@@ -1279,7 +1268,7 @@ static DB_plugin_action_t action_quit = {
 };
 
 static DB_plugin_action_t action_delete_from_disk = {
-    .title = "Delete From Disk",
+    .title = "Remove From Disk",
     .name = "delete_from_disk",
     .flags = DB_ACTION_MULTIPLE_TRACKS,
     .callback2 = action_delete_from_disk_handler,
@@ -1320,7 +1309,7 @@ static DB_plugin_action_t action_open_files = {
 
 
 static DB_plugin_action_t action_track_properties = {
-    .title = "Track properties",
+    .title = "Track Properties",
     .name = "track_properties",
     .flags = DB_ACTION_MULTIPLE_TRACKS,
     .callback2 = action_show_track_properties_handler,
@@ -1328,7 +1317,7 @@ static DB_plugin_action_t action_track_properties = {
 };
 
 static DB_plugin_action_t action_show_help = {
-    .title = "Help/Show help page",
+    .title = "Help/Show Help Page",
     .name = "help",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_show_help_handler,
@@ -1336,7 +1325,7 @@ static DB_plugin_action_t action_show_help = {
 };
 
 static DB_plugin_action_t action_playback_loop_cycle = {
-    .title = "Playback/Cycle playback looping mode",
+    .title = "Playback/Cycle Playback Looping Mode",
     .name = "loop_cycle",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playback_loop_cycle_handler,
@@ -1344,7 +1333,7 @@ static DB_plugin_action_t action_playback_loop_cycle = {
 };
 
 static DB_plugin_action_t action_playback_loop_off = {
-    .title = "Playback/Playback looping - Don't loop",
+    .title = "Playback/Playback Looping - Don't loop",
     .name = "loop_off",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playback_loop_off_handler,
@@ -1352,7 +1341,7 @@ static DB_plugin_action_t action_playback_loop_off = {
 };
 
 static DB_plugin_action_t action_playback_loop_single = {
-    .title = "Playback/Playback looping - Single track",
+    .title = "Playback/Playback Looping - Single track",
     .name = "loop_track",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playback_loop_single_handler,
@@ -1360,7 +1349,7 @@ static DB_plugin_action_t action_playback_loop_single = {
 };
 
 static DB_plugin_action_t action_playback_loop_all = {
-    .title = "Playback/Playback looping - All",
+    .title = "Playback/Playback Looping - All",
     .name = "loop_all",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playback_loop_all_handler,
@@ -1368,7 +1357,7 @@ static DB_plugin_action_t action_playback_loop_all = {
 };
 
 static DB_plugin_action_t action_playback_order_cycle = {
-    .title = "Playback/Cycle playback order",
+    .title = "Playback/Cycle Playback Order",
     .name = "order_cycle",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playback_order_cycle_handler,
@@ -1376,7 +1365,7 @@ static DB_plugin_action_t action_playback_order_cycle = {
 };
 
 static DB_plugin_action_t action_playback_order_random = {
-    .title = "Playback/Playback order - Random",
+    .title = "Playback/Playback Order - Random",
     .name = "order_random",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playback_order_random_handler,
@@ -1384,7 +1373,7 @@ static DB_plugin_action_t action_playback_order_random = {
 };
 
 static DB_plugin_action_t action_playback_order_shuffle_albums = {
-    .title = "Playback/Playback order - Shuffle albums",
+    .title = "Playback/Playback Order - Shuffle albums",
     .name = "order_shuffle_albums",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playback_order_shuffle_albums_handler,
@@ -1392,7 +1381,7 @@ static DB_plugin_action_t action_playback_order_shuffle_albums = {
 };
 
 static DB_plugin_action_t action_playback_order_shuffle = {
-    .title = "Playback/Playback order - Shuffle tracks",
+    .title = "Playback/Playback Order - Shuffle tracks",
     .name = "order_shuffle",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playback_order_shuffle_handler,
@@ -1400,7 +1389,7 @@ static DB_plugin_action_t action_playback_order_shuffle = {
 };
 
 static DB_plugin_action_t action_playback_order_linear = {
-    .title = "Playback/Playback order - Linear",
+    .title = "Playback/Playback Order - Linear",
     .name = "order_linear",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playback_order_linear_handler,
@@ -1409,7 +1398,7 @@ static DB_plugin_action_t action_playback_order_linear = {
 
 
 static DB_plugin_action_t action_cursor_follows_playback = {
-    .title = "Playback/Cursor follows playback toggle",
+    .title = "Playback/Toggle Cursor Follows Playback",
     .name = "toggle_cursor_follows_playback",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_cursor_follows_playback_handler,
@@ -1418,7 +1407,7 @@ static DB_plugin_action_t action_cursor_follows_playback = {
 
 
 static DB_plugin_action_t action_scroll_follows_playback = {
-    .title = "Playback/Scroll follows playback toggle",
+    .title = "Playback/Toggle Scroll Follows Playback",
     .name = "toggle_scroll_follows_playback",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_scroll_follows_playback_handler,
@@ -1442,7 +1431,7 @@ static DB_plugin_action_t action_toggle_statusbar = {
 };
 
 static DB_plugin_action_t action_toggle_designmode = {
-    .title = "Edit/Toggle design mode",
+    .title = "Edit/Toggle Design Mode",
     .name = "toggle_design_mode",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_toggle_designmode_handler,
@@ -1474,7 +1463,7 @@ static DB_plugin_action_t action_crop_selected = {
 };
 
 static DB_plugin_action_t action_remove_from_playlist = {
-    .title = "Edit/Remove from current playlist",
+    .title = "Edit/Remove Track(s) From Current Playlist",
     .name = "remove_from_playlist",
     .flags = DB_ACTION_MULTIPLE_TRACKS,
     .callback2 = action_remove_from_playlist_handler,
@@ -1482,7 +1471,7 @@ static DB_plugin_action_t action_remove_from_playlist = {
 };
 
 static DB_plugin_action_t action_save_playlist = {
-    .title = "File/Save playlist",
+    .title = "File/Save Playlist",
     .name = "save_playlist",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_save_playlist_handler,
@@ -1490,7 +1479,7 @@ static DB_plugin_action_t action_save_playlist = {
 };
 
 static DB_plugin_action_t action_load_playlist = {
-    .title = "File/Load playlist",
+    .title = "File/Load Playlist",
     .name = "load_playlist",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_load_playlist_handler,
@@ -1498,7 +1487,7 @@ static DB_plugin_action_t action_load_playlist = {
 };
 
 static DB_plugin_action_t action_remove_current_playlist = {
-    .title = "File/Remove current playlist",
+    .title = "File/Remove Current Playlist",
     .name = "remove_current_playlist",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_remove_current_playlist_handler,
@@ -1593,10 +1582,11 @@ ddb_gui_GTK3_load (DB_functions_t *api) {
 static const char settings_dlg[] =
     "property \"Ask confirmation to delete files from disk\" checkbox gtkui.delete_files_ask 1;\n"
     "property \"Status icon volume control sensitivity\" entry gtkui.tray_volume_sensitivity 1;\n"
-//    "property \"Show volume in dB (percentage otherwise)\" entry gtkui.show_gain_in_db 1\n"
     "property \"Custom status icon\" entry gtkui.custom_tray_icon \"" TRAY_ICON "\" ;\n"
     "property \"Run gtk_init with --sync (debug mode)\" checkbox gtkui.sync 0;\n"
     "property \"Add separators between plugin context menu items\" checkbox gtkui.action_separators 0;\n"
+    "property \"Use unicode chars instead of images for track state\" checkbox gtkui.unicode_playstate 0;\n"
+    "property \"Disable seekbar overlay text\" checkbox gtkui.disable_seekbar_overlay 0;\n"
 ;
 
 // define plugin interface
diff --git a/plugins/gtkui/gtkui.h b/plugins/gtkui/gtkui.h
index abd71af..48ba097 100644
--- a/plugins/gtkui/gtkui.h
+++ b/plugins/gtkui/gtkui.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -36,6 +36,8 @@ extern GtkWidget *mainwin;
 extern GtkWidget *searchwin;
 extern int gtkui_embolden_current_track;
 extern int gtkui_is_retina;
+extern int gtkui_unicode_playstate;
+extern int gtkui_disable_seekbar_overlay;
 
 struct _GSList;
 
@@ -94,9 +96,6 @@ int
 gtkui_add_new_playlist (void);
 
 void
-seekbar_redraw (void);
-
-void
 seekbar_draw (GtkWidget *widget, cairo_t *cr);
 
 gboolean
@@ -112,9 +111,6 @@ on_seekbar_motion_notify_event         (GtkWidget       *widget,
                                         GdkEventMotion  *event);
 
 void
-volumebar_redraw (void);
-
-void
 gtkui_set_titlebar (DB_playItem_t *it);
 
 gboolean
@@ -129,9 +125,6 @@ gtkui_set_progress_text_idle (gpointer data);
 void
 gtkui_playlist_set_curr (int playlist);
 
-void
-gtkui_setup_gui_refresh ();
-
 int
 gtkui_get_curr_playlist_mod (void);
 
@@ -162,4 +155,7 @@ gtkui_quit (void);
 void
 gtkui_run_preferences_dlg (void);
 
+int
+gtkui_get_gui_refresh_rate ();
+
 #endif
diff --git a/plugins/gtkui/gtkui_api.h b/plugins/gtkui/gtkui_api.h
index c805733..f7d2479 100644
--- a/plugins/gtkui/gtkui_api.h
+++ b/plugins/gtkui/gtkui_api.h
@@ -35,7 +35,7 @@
 // for information, about how to port your plugin to the new API correctly,
 // and to learn more about design mode programming,
 // please visit the following page:
-// http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Porting_GUI_plugins_to_0.6
+// http://github.com/Alexey-Yakovenko/deadbeef/wiki/Porting-GUI-plugins-to-deadbeef-from-0.5.x-to-0.6.0
 
 #if GTK_CHECK_VERSION(3,0,0)
 #define DDB_GTKUI_PLUGIN_ID "gtkui3_1"
@@ -44,7 +44,10 @@
 #endif
 
 #define DDB_GTKUI_API_VERSION_MAJOR 2
-#define DDB_GTKUI_API_VERSION_MINOR 0
+#define DDB_GTKUI_API_VERSION_MINOR 1
+
+// added in API 2.1
+#define DDB_GTKUI_CONF_LAYOUT "gtkui.layout.0.6.2"
 
 // this flag tells that the widget should be added to h/vboxes with expand=FALSE
 #define DDB_GTKUI_WIDGET_FLAG_NON_EXPANDABLE 0x00000001
diff --git a/plugins/gtkui/gtkuigl.c b/plugins/gtkui/gtkuigl.c
index 2522673..21af0a1 100644
--- a/plugins/gtkui/gtkuigl.c
+++ b/plugins/gtkui/gtkuigl.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/gtkuigl.h b/plugins/gtkui/gtkuigl.h
index 88e2d5c..baeed10 100644
--- a/plugins/gtkui/gtkuigl.h
+++ b/plugins/gtkui/gtkuigl.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/hotkeys.c b/plugins/gtkui/hotkeys.c
index 10caec8..e8bffef 100644
--- a/plugins/gtkui/hotkeys.c
+++ b/plugins/gtkui/hotkeys.c
@@ -421,9 +421,15 @@ on_hotkeys_actions_clicked             (GtkButton       *button,
     gtk_widget_destroy (dlg);
 }
 
-
 void
 prefwin_init_hotkeys (GtkWidget *_prefwin) {
+    DB_plugin_t *hkplug = deadbeef->plug_get_for_id ("hotkeys");
+    if (!hkplug) {
+        // remove hotkeys tab
+        gtk_notebook_remove_page (GTK_NOTEBOOK (lookup_widget (_prefwin, "notebook")), 6);
+        return;
+    }
+
     gtkui_hotkeys_changed = 0;
     ctx_names[DDB_ACTION_CTX_MAIN] = _("Main");
     ctx_names[DDB_ACTION_CTX_SELECTION] = _("Selection");
@@ -923,6 +929,7 @@ gtkui_set_default_hotkeys (void) {
     deadbeef->conf_set_str ("hotkey.key29", "v 0 0 stop");
     deadbeef->conf_set_str ("hotkey.key30", "b 0 0 next");
     deadbeef->conf_set_str ("hotkey.key31", "n 0 0 playback_random");
+    deadbeef->conf_set_str ("hotkey.key32", "\"Ctrl k\" 0 0 toggle_stop_after_album");
     deadbeef->conf_save ();
 }
 
diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c
index 04c0de8..6f8ea8c 100644
--- a/plugins/gtkui/interface.c
+++ b/plugins/gtkui/interface.c
@@ -35,12 +35,12 @@ create_mainwin (void)
   GtkWidget *File;
   GtkWidget *File_menu;
   GtkWidget *open;
-  GtkWidget *image647;
+  GtkWidget *image663;
   GtkWidget *separator2;
   GtkWidget *add_files;
-  GtkWidget *image648;
+  GtkWidget *image664;
   GtkWidget *add_folders;
-  GtkWidget *image649;
+  GtkWidget *image665;
   GtkWidget *add_location1;
   GtkWidget *separatormenuitem1;
   GtkWidget *new_playlist1;
@@ -48,18 +48,18 @@ create_mainwin (void)
   GtkWidget *playlist_save_as;
   GtkWidget *separator8;
   GtkWidget *quit;
-  GtkWidget *image650;
+  GtkWidget *image666;
   GtkWidget *Edit;
   GtkWidget *Edit_menu;
   GtkWidget *clear1;
-  GtkWidget *image651;
+  GtkWidget *image667;
   GtkWidget *select_all1;
   GtkWidget *deselect_all1;
   GtkWidget *invert_selection1;
   GtkWidget *Selection;
   GtkWidget *Selection_menu;
   GtkWidget *remove1;
-  GtkWidget *image652;
+  GtkWidget *image668;
   GtkWidget *crop1;
   GtkWidget *find1;
   GtkWidget *sort_by1;
@@ -96,35 +96,22 @@ create_mainwin (void)
   GtkWidget *scroll_follows_playback;
   GtkWidget *cursor_follows_playback;
   GtkWidget *stop_after_current;
+  GtkWidget *stop_after_album;
   GtkWidget *separator11;
   GtkWidget *jump_to_current_track1;
   GtkWidget *Help;
   GtkWidget *Help_menu;
   GtkWidget *help1;
-  GtkWidget *image653;
+  GtkWidget *image669;
   GtkWidget *changelog1;
   GtkWidget *separator10;
   GtkWidget *gpl1;
   GtkWidget *lgpl1;
   GtkWidget *separator9;
   GtkWidget *about1;
-  GtkWidget *image654;
+  GtkWidget *image670;
   GtkWidget *translators1;
-  GtkWidget *image655;
-  GtkWidget *hbox2;
-  GtkWidget *hbox3;
-  GtkWidget *stopbtn;
-  GtkWidget *image128;
-  GtkWidget *playbtn;
-  GtkWidget *image2;
-  GtkWidget *pausebtn;
-  GtkWidget *image3;
-  GtkWidget *prevbtn;
-  GtkWidget *image4;
-  GtkWidget *nextbtn;
-  GtkWidget *image5;
-  GtkWidget *seekbar;
-  GtkWidget *volumebar;
+  GtkWidget *image671;
   GtkWidget *plugins_bottom_vbox;
   GtkWidget *statusbar;
 
@@ -152,9 +139,9 @@ create_mainwin (void)
   gtk_widget_show (open);
   gtk_container_add (GTK_CONTAINER (File_menu), open);
 
-  image647 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image647);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image647);
+  image663 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image663);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image663);
 
   separator2 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator2);
@@ -165,17 +152,17 @@ create_mainwin (void)
   gtk_widget_show (add_files);
   gtk_container_add (GTK_CONTAINER (File_menu), add_files);
 
-  image648 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image648);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image648);
+  image664 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image664);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image664);
 
   add_folders = gtk_image_menu_item_new_with_mnemonic (_("Add folder(s)"));
   gtk_widget_show (add_folders);
   gtk_container_add (GTK_CONTAINER (File_menu), add_folders);
 
-  image649 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image649);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image649);
+  image665 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image665);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image665);
 
   add_location1 = gtk_menu_item_new_with_mnemonic (_("Add location"));
   gtk_widget_show (add_location1);
@@ -207,9 +194,9 @@ create_mainwin (void)
   gtk_widget_show (quit);
   gtk_container_add (GTK_CONTAINER (File_menu), quit);
 
-  image650 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image650);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image650);
+  image666 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image666);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image666);
 
   Edit = gtk_menu_item_new_with_mnemonic (_("_Edit"));
   gtk_widget_show (Edit);
@@ -222,9 +209,9 @@ create_mainwin (void)
   gtk_widget_show (clear1);
   gtk_container_add (GTK_CONTAINER (Edit_menu), clear1);
 
-  image651 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image651);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image651);
+  image667 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image667);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image667);
 
   select_all1 = gtk_menu_item_new_with_mnemonic (_("Select all"));
   gtk_widget_show (select_all1);
@@ -249,9 +236,9 @@ create_mainwin (void)
   gtk_widget_show (remove1);
   gtk_container_add (GTK_CONTAINER (Selection_menu), remove1);
 
-  image652 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image652);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image652);
+  image668 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image668);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image668);
 
   crop1 = gtk_menu_item_new_with_mnemonic (_("Crop"));
   gtk_widget_show (crop1);
@@ -396,10 +383,14 @@ create_mainwin (void)
   gtk_widget_show (cursor_follows_playback);
   gtk_container_add (GTK_CONTAINER (Playback_menu), cursor_follows_playback);
 
-  stop_after_current = gtk_check_menu_item_new_with_mnemonic (_("Stop after current"));
+  stop_after_current = gtk_check_menu_item_new_with_mnemonic (_("Stop after current track"));
   gtk_widget_show (stop_after_current);
   gtk_container_add (GTK_CONTAINER (Playback_menu), stop_after_current);
 
+  stop_after_album = gtk_check_menu_item_new_with_mnemonic (_("Stop after current album"));
+  gtk_widget_show (stop_after_album);
+  gtk_container_add (GTK_CONTAINER (Playback_menu), stop_after_album);
+
   separator11 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator11);
   gtk_container_add (GTK_CONTAINER (Playback_menu), separator11);
@@ -420,9 +411,9 @@ create_mainwin (void)
   gtk_widget_show (help1);
   gtk_container_add (GTK_CONTAINER (Help_menu), help1);
 
-  image653 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image653);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image653);
+  image669 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image669);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image669);
 
   changelog1 = gtk_menu_item_new_with_mnemonic (_("_ChangeLog"));
   gtk_widget_show (changelog1);
@@ -450,89 +441,17 @@ create_mainwin (void)
   gtk_widget_show (about1);
   gtk_container_add (GTK_CONTAINER (Help_menu), about1);
 
-  image654 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image654);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about1), image654);
+  image670 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image670);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about1), image670);
 
   translators1 = gtk_image_menu_item_new_with_mnemonic (_("_Translators"));
   gtk_widget_show (translators1);
   gtk_container_add (GTK_CONTAINER (Help_menu), translators1);
 
-  image655 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image655);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (translators1), image655);
-
-  hbox2 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox2);
-  gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, FALSE, 0);
-
-  hbox3 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox3);
-  gtk_box_pack_start (GTK_BOX (hbox2), hbox3, FALSE, TRUE, 0);
-
-  stopbtn = gtk_button_new ();
-  gtk_widget_show (stopbtn);
-  gtk_box_pack_start (GTK_BOX (hbox3), stopbtn, FALSE, FALSE, 0);
-  gtk_widget_set_can_focus(stopbtn, FALSE);
-  gtk_button_set_relief (GTK_BUTTON (stopbtn), GTK_RELIEF_NONE);
-
-  image128 = gtk_image_new_from_stock ("gtk-media-stop", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image128);
-  gtk_container_add (GTK_CONTAINER (stopbtn), image128);
-
-  playbtn = gtk_button_new ();
-  gtk_widget_show (playbtn);
-  gtk_box_pack_start (GTK_BOX (hbox3), playbtn, FALSE, FALSE, 0);
-  gtk_widget_set_can_focus(playbtn, FALSE);
-  gtk_button_set_relief (GTK_BUTTON (playbtn), GTK_RELIEF_NONE);
-
-  image2 = gtk_image_new_from_stock ("gtk-media-play", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image2);
-  gtk_container_add (GTK_CONTAINER (playbtn), image2);
-
-  pausebtn = gtk_button_new ();
-  gtk_widget_show (pausebtn);
-  gtk_box_pack_start (GTK_BOX (hbox3), pausebtn, FALSE, FALSE, 0);
-  gtk_widget_set_can_focus(pausebtn, FALSE);
-  gtk_button_set_relief (GTK_BUTTON (pausebtn), GTK_RELIEF_NONE);
-
-  image3 = gtk_image_new_from_stock ("gtk-media-pause", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image3);
-  gtk_container_add (GTK_CONTAINER (pausebtn), image3);
-
-  prevbtn = gtk_button_new ();
-  gtk_widget_show (prevbtn);
-  gtk_box_pack_start (GTK_BOX (hbox3), prevbtn, FALSE, FALSE, 0);
-  gtk_widget_set_can_focus(prevbtn, FALSE);
-  gtk_button_set_relief (GTK_BUTTON (prevbtn), GTK_RELIEF_NONE);
-
-  image4 = gtk_image_new_from_stock ("gtk-media-previous", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image4);
-  gtk_container_add (GTK_CONTAINER (prevbtn), image4);
-
-  nextbtn = gtk_button_new ();
-  gtk_widget_show (nextbtn);
-  gtk_box_pack_start (GTK_BOX (hbox3), nextbtn, FALSE, FALSE, 0);
-  gtk_widget_set_can_focus(nextbtn, FALSE);
-  gtk_button_set_relief (GTK_BUTTON (nextbtn), GTK_RELIEF_NONE);
-
-  image5 = gtk_image_new_from_stock ("gtk-media-next", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image5);
-  gtk_container_add (GTK_CONTAINER (nextbtn), image5);
-
-  seekbar = create_seekbar ("seekbar", "", "", 0, 0);
-  gtk_widget_show (seekbar);
-  gtk_box_pack_start (GTK_BOX (hbox2), seekbar, TRUE, TRUE, 2);
-  gtk_widget_set_size_request (seekbar, 20, -1);
-  gtk_widget_set_can_focus(seekbar, FALSE);
-  gtk_widget_set_can_default(seekbar, FALSE);
-
-  volumebar = create_volumebar_widget ("volumebar", "", "", 0, 0);
-  gtk_widget_show (volumebar);
-  gtk_box_pack_start (GTK_BOX (hbox2), volumebar, FALSE, TRUE, 2);
-  gtk_widget_set_size_request (volumebar, 70, -1);
-  gtk_widget_set_can_focus(volumebar, FALSE);
-  gtk_widget_set_can_default(volumebar, FALSE);
+  image671 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image671);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (translators1), image671);
 
   plugins_bottom_vbox = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (plugins_bottom_vbox);
@@ -560,15 +479,6 @@ create_mainwin (void)
   g_signal_connect ((gpointer) mainwin, "button_press_event",
                     G_CALLBACK (on_mainwin_button_press_event),
                     NULL);
-  g_signal_connect ((gpointer) mainwin, "button_release_event",
-                    G_CALLBACK (on_mainwin_button_release_event),
-                    NULL);
-  g_signal_connect ((gpointer) mainwin, "scroll_event",
-                    G_CALLBACK (on_mainwin_scroll_event),
-                    NULL);
-  g_signal_connect ((gpointer) mainwin, "motion_notify_event",
-                    G_CALLBACK (on_mainwin_motion_notify_event),
-                    NULL);
   g_signal_connect ((gpointer) open, "activate",
                     G_CALLBACK (on_open_activate),
                     NULL);
@@ -677,6 +587,9 @@ create_mainwin (void)
   g_signal_connect ((gpointer) stop_after_current, "activate",
                     G_CALLBACK (on_stop_after_current_activate),
                     NULL);
+  g_signal_connect ((gpointer) stop_after_album, "activate",
+                    G_CALLBACK (on_stop_after_album_activate),
+                    NULL);
   g_signal_connect ((gpointer) jump_to_current_track1, "activate",
                     G_CALLBACK (on_jump_to_current_track1_activate),
                     NULL);
@@ -698,21 +611,6 @@ create_mainwin (void)
   g_signal_connect ((gpointer) translators1, "activate",
                     G_CALLBACK (on_translators1_activate),
                     NULL);
-  g_signal_connect ((gpointer) stopbtn, "clicked",
-                    G_CALLBACK (on_stopbtn_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) playbtn, "clicked",
-                    G_CALLBACK (on_playbtn_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) pausebtn, "clicked",
-                    G_CALLBACK (on_pausebtn_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) prevbtn, "clicked",
-                    G_CALLBACK (on_prevbtn_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) nextbtn, "clicked",
-                    G_CALLBACK (on_nextbtn_clicked),
-                    NULL);
 
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT_NO_REF (mainwin, mainwin, "mainwin");
@@ -721,12 +619,12 @@ create_mainwin (void)
   GLADE_HOOKUP_OBJECT (mainwin, File, "File");
   GLADE_HOOKUP_OBJECT (mainwin, File_menu, "File_menu");
   GLADE_HOOKUP_OBJECT (mainwin, open, "open");
-  GLADE_HOOKUP_OBJECT (mainwin, image647, "image647");
+  GLADE_HOOKUP_OBJECT (mainwin, image663, "image663");
   GLADE_HOOKUP_OBJECT (mainwin, separator2, "separator2");
   GLADE_HOOKUP_OBJECT (mainwin, add_files, "add_files");
-  GLADE_HOOKUP_OBJECT (mainwin, image648, "image648");
+  GLADE_HOOKUP_OBJECT (mainwin, image664, "image664");
   GLADE_HOOKUP_OBJECT (mainwin, add_folders, "add_folders");
-  GLADE_HOOKUP_OBJECT (mainwin, image649, "image649");
+  GLADE_HOOKUP_OBJECT (mainwin, image665, "image665");
   GLADE_HOOKUP_OBJECT (mainwin, add_location1, "add_location1");
   GLADE_HOOKUP_OBJECT (mainwin, separatormenuitem1, "separatormenuitem1");
   GLADE_HOOKUP_OBJECT (mainwin, new_playlist1, "new_playlist1");
@@ -734,18 +632,18 @@ create_mainwin (void)
   GLADE_HOOKUP_OBJECT (mainwin, playlist_save_as, "playlist_save_as");
   GLADE_HOOKUP_OBJECT (mainwin, separator8, "separator8");
   GLADE_HOOKUP_OBJECT (mainwin, quit, "quit");
-  GLADE_HOOKUP_OBJECT (mainwin, image650, "image650");
+  GLADE_HOOKUP_OBJECT (mainwin, image666, "image666");
   GLADE_HOOKUP_OBJECT (mainwin, Edit, "Edit");
   GLADE_HOOKUP_OBJECT (mainwin, Edit_menu, "Edit_menu");
   GLADE_HOOKUP_OBJECT (mainwin, clear1, "clear1");
-  GLADE_HOOKUP_OBJECT (mainwin, image651, "image651");
+  GLADE_HOOKUP_OBJECT (mainwin, image667, "image667");
   GLADE_HOOKUP_OBJECT (mainwin, select_all1, "select_all1");
   GLADE_HOOKUP_OBJECT (mainwin, deselect_all1, "deselect_all1");
   GLADE_HOOKUP_OBJECT (mainwin, invert_selection1, "invert_selection1");
   GLADE_HOOKUP_OBJECT (mainwin, Selection, "Selection");
   GLADE_HOOKUP_OBJECT (mainwin, Selection_menu, "Selection_menu");
   GLADE_HOOKUP_OBJECT (mainwin, remove1, "remove1");
-  GLADE_HOOKUP_OBJECT (mainwin, image652, "image652");
+  GLADE_HOOKUP_OBJECT (mainwin, image668, "image668");
   GLADE_HOOKUP_OBJECT (mainwin, crop1, "crop1");
   GLADE_HOOKUP_OBJECT (mainwin, find1, "find1");
   GLADE_HOOKUP_OBJECT (mainwin, sort_by1, "sort_by1");
@@ -780,35 +678,22 @@ create_mainwin (void)
   GLADE_HOOKUP_OBJECT (mainwin, scroll_follows_playback, "scroll_follows_playback");
   GLADE_HOOKUP_OBJECT (mainwin, cursor_follows_playback, "cursor_follows_playback");
   GLADE_HOOKUP_OBJECT (mainwin, stop_after_current, "stop_after_current");
+  GLADE_HOOKUP_OBJECT (mainwin, stop_after_album, "stop_after_album");
   GLADE_HOOKUP_OBJECT (mainwin, separator11, "separator11");
   GLADE_HOOKUP_OBJECT (mainwin, jump_to_current_track1, "jump_to_current_track1");
   GLADE_HOOKUP_OBJECT (mainwin, Help, "Help");
   GLADE_HOOKUP_OBJECT (mainwin, Help_menu, "Help_menu");
   GLADE_HOOKUP_OBJECT (mainwin, help1, "help1");
-  GLADE_HOOKUP_OBJECT (mainwin, image653, "image653");
+  GLADE_HOOKUP_OBJECT (mainwin, image669, "image669");
   GLADE_HOOKUP_OBJECT (mainwin, changelog1, "changelog1");
   GLADE_HOOKUP_OBJECT (mainwin, separator10, "separator10");
   GLADE_HOOKUP_OBJECT (mainwin, gpl1, "gpl1");
   GLADE_HOOKUP_OBJECT (mainwin, lgpl1, "lgpl1");
   GLADE_HOOKUP_OBJECT (mainwin, separator9, "separator9");
   GLADE_HOOKUP_OBJECT (mainwin, about1, "about1");
-  GLADE_HOOKUP_OBJECT (mainwin, image654, "image654");
+  GLADE_HOOKUP_OBJECT (mainwin, image670, "image670");
   GLADE_HOOKUP_OBJECT (mainwin, translators1, "translators1");
-  GLADE_HOOKUP_OBJECT (mainwin, image655, "image655");
-  GLADE_HOOKUP_OBJECT (mainwin, hbox2, "hbox2");
-  GLADE_HOOKUP_OBJECT (mainwin, hbox3, "hbox3");
-  GLADE_HOOKUP_OBJECT (mainwin, stopbtn, "stopbtn");
-  GLADE_HOOKUP_OBJECT (mainwin, image128, "image128");
-  GLADE_HOOKUP_OBJECT (mainwin, playbtn, "playbtn");
-  GLADE_HOOKUP_OBJECT (mainwin, image2, "image2");
-  GLADE_HOOKUP_OBJECT (mainwin, pausebtn, "pausebtn");
-  GLADE_HOOKUP_OBJECT (mainwin, image3, "image3");
-  GLADE_HOOKUP_OBJECT (mainwin, prevbtn, "prevbtn");
-  GLADE_HOOKUP_OBJECT (mainwin, image4, "image4");
-  GLADE_HOOKUP_OBJECT (mainwin, nextbtn, "nextbtn");
-  GLADE_HOOKUP_OBJECT (mainwin, image5, "image5");
-  GLADE_HOOKUP_OBJECT (mainwin, seekbar, "seekbar");
-  GLADE_HOOKUP_OBJECT (mainwin, volumebar, "volumebar");
+  GLADE_HOOKUP_OBJECT (mainwin, image671, "image671");
   GLADE_HOOKUP_OBJECT (mainwin, plugins_bottom_vbox, "plugins_bottom_vbox");
   GLADE_HOOKUP_OBJECT (mainwin, statusbar, "statusbar");
 
@@ -854,9 +739,9 @@ create_searchwin (void)
   g_signal_connect ((gpointer) searchwin, "window_state_event",
                     G_CALLBACK (on_searchwin_window_state_event),
                     NULL);
-  g_signal_connect_after ((gpointer) searchwin, "key_press_event",
-                          G_CALLBACK (on_searchwin_key_press_event),
-                          NULL);
+  g_signal_connect ((gpointer) searchwin, "key_press_event",
+                    G_CALLBACK (on_searchwin_key_press_event),
+                    NULL);
   g_signal_connect ((gpointer) searchentry, "changed",
                     G_CALLBACK (on_searchentry_changed),
                     NULL);
@@ -1415,6 +1300,7 @@ create_editcolumndlg (void)
 
   editcolumndlg = gtk_dialog_new ();
   gtk_window_set_title (GTK_WINDOW (editcolumndlg), "editcolumndlg");
+  gtk_window_set_position (GTK_WINDOW (editcolumndlg), GTK_WIN_POS_MOUSE);
   gtk_window_set_modal (GTK_WINDOW (editcolumndlg), TRUE);
   gtk_window_set_type_hint (GTK_WINDOW (editcolumndlg), GDK_WINDOW_TYPE_HINT_DIALOG);
 
@@ -1630,6 +1516,7 @@ create_prefwin (void)
   GtkWidget *resume_last_session;
   GtkWidget *ignore_archives;
   GtkWidget *reset_autostop;
+  GtkWidget *reset_autostopalbum;
   GtkWidget *label39;
   GtkWidget *vbox29;
   GtkWidget *hbox80;
@@ -1652,6 +1539,7 @@ create_prefwin (void)
   GtkWidget *vbox9;
   GtkWidget *pref_close_send_to_tray;
   GtkWidget *hide_tray_icon;
+  GtkWidget *enable_shift_jis_recoding;
   GtkWidget *enable_cp1251_recoding;
   GtkWidget *enable_cp936_recoding;
   GtkWidget *hbox102;
@@ -1954,10 +1842,14 @@ create_prefwin (void)
   gtk_widget_show (ignore_archives);
   gtk_box_pack_start (GTK_BOX (vbox8), ignore_archives, FALSE, FALSE, 0);
 
-  reset_autostop = gtk_check_button_new_with_mnemonic (_("Auto-reset \"Stop after current\""));
+  reset_autostop = gtk_check_button_new_with_mnemonic (_("\"Stop after current track\" option will switch off after triggering"));
   gtk_widget_show (reset_autostop);
   gtk_box_pack_start (GTK_BOX (vbox8), reset_autostop, FALSE, FALSE, 0);
 
+  reset_autostopalbum = gtk_check_button_new_with_mnemonic (_("\"Stop after current album\" option will switch off after triggering"));
+  gtk_widget_show (reset_autostopalbum);
+  gtk_box_pack_start (GTK_BOX (vbox8), reset_autostopalbum, FALSE, FALSE, 0);
+
   label39 = gtk_label_new (_("Playback"));
   gtk_widget_show (label39);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1), label39);
@@ -2052,6 +1944,10 @@ create_prefwin (void)
   gtk_widget_show (hide_tray_icon);
   gtk_box_pack_start (GTK_BOX (vbox9), hide_tray_icon, FALSE, FALSE, 0);
 
+  enable_shift_jis_recoding = gtk_check_button_new_with_mnemonic (_("Enable Japanese SHIFT-JIS detection and recoding"));
+  gtk_widget_show (enable_shift_jis_recoding);
+  gtk_box_pack_start (GTK_BOX (vbox9), enable_shift_jis_recoding, FALSE, FALSE, 0);
+
   enable_cp1251_recoding = gtk_check_button_new_with_mnemonic (_("Enable Russian CP1251 detection and recoding"));
   gtk_widget_show (enable_cp1251_recoding);
   gtk_box_pack_start (GTK_BOX (vbox9), enable_cp1251_recoding, FALSE, FALSE, 0);
@@ -2131,7 +2027,7 @@ create_prefwin (void)
   gtk_widget_show (embolden_current);
   gtk_box_pack_start (GTK_BOX (vbox44), embolden_current, FALSE, FALSE, 0);
 
-  hide_delete_from_disk = gtk_check_button_new_with_mnemonic (_("Hide \"Delete from disk\" context menu item"));
+  hide_delete_from_disk = gtk_check_button_new_with_mnemonic (_("Hide \"Remove From Disk\" context menu item"));
   gtk_widget_show (hide_delete_from_disk);
   gtk_box_pack_start (GTK_BOX (vbox44), hide_delete_from_disk, FALSE, FALSE, 0);
 
@@ -2776,6 +2672,9 @@ create_prefwin (void)
   g_signal_connect ((gpointer) reset_autostop, "toggled",
                     G_CALLBACK (on_reset_autostop_toggled),
                     NULL);
+  g_signal_connect ((gpointer) reset_autostopalbum, "toggled",
+                    G_CALLBACK (on_reset_autostopalbum_toggled),
+                    NULL);
   g_signal_connect ((gpointer) dsp_add, "clicked",
                     G_CALLBACK (on_dsp_add_clicked),
                     NULL);
@@ -2806,6 +2705,9 @@ create_prefwin (void)
   g_signal_connect ((gpointer) hide_tray_icon, "toggled",
                     G_CALLBACK (on_hide_tray_icon_toggled),
                     NULL);
+  g_signal_connect ((gpointer) enable_shift_jis_recoding, "toggled",
+                    G_CALLBACK (on_enable_shift_jis_recoding_toggled),
+                    NULL);
   g_signal_connect ((gpointer) enable_cp1251_recoding, "toggled",
                     G_CALLBACK (on_enable_cp1251_recoding_toggled),
                     NULL);
@@ -2987,6 +2889,7 @@ create_prefwin (void)
   GLADE_HOOKUP_OBJECT (prefwin, resume_last_session, "resume_last_session");
   GLADE_HOOKUP_OBJECT (prefwin, ignore_archives, "ignore_archives");
   GLADE_HOOKUP_OBJECT (prefwin, reset_autostop, "reset_autostop");
+  GLADE_HOOKUP_OBJECT (prefwin, reset_autostopalbum, "reset_autostopalbum");
   GLADE_HOOKUP_OBJECT (prefwin, label39, "label39");
   GLADE_HOOKUP_OBJECT (prefwin, vbox29, "vbox29");
   GLADE_HOOKUP_OBJECT (prefwin, hbox80, "hbox80");
@@ -3009,6 +2912,7 @@ create_prefwin (void)
   GLADE_HOOKUP_OBJECT (prefwin, vbox9, "vbox9");
   GLADE_HOOKUP_OBJECT (prefwin, pref_close_send_to_tray, "pref_close_send_to_tray");
   GLADE_HOOKUP_OBJECT (prefwin, hide_tray_icon, "hide_tray_icon");
+  GLADE_HOOKUP_OBJECT (prefwin, enable_shift_jis_recoding, "enable_shift_jis_recoding");
   GLADE_HOOKUP_OBJECT (prefwin, enable_cp1251_recoding, "enable_cp1251_recoding");
   GLADE_HOOKUP_OBJECT (prefwin, enable_cp936_recoding, "enable_cp936_recoding");
   GLADE_HOOKUP_OBJECT (prefwin, hbox102, "hbox102");
@@ -3272,9 +3176,13 @@ create_addlocationdlg (void)
 {
   GtkWidget *addlocationdlg;
   GtkWidget *dialog_vbox4;
+  GtkWidget *vbox45;
   GtkWidget *hbox34;
   GtkWidget *label41;
   GtkWidget *addlocation_entry;
+  GtkWidget *hbox122;
+  GtkWidget *set_custom_title;
+  GtkWidget *custom_title;
   GtkWidget *addlocation_actionarea;
   GtkWidget *cancelbutton3;
   GtkWidget *alignment18;
@@ -3294,10 +3202,14 @@ create_addlocationdlg (void)
   dialog_vbox4 = gtk_dialog_get_content_area (GTK_DIALOG (addlocationdlg));
   gtk_widget_show (dialog_vbox4);
 
+  vbox45 = gtk_vbox_new (FALSE, 8);
+  gtk_widget_show (vbox45);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox4), vbox45, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox45), 12);
+
   hbox34 = gtk_hbox_new (FALSE, 8);
   gtk_widget_show (hbox34);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox4), hbox34, TRUE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox34), 12);
+  gtk_box_pack_start (GTK_BOX (vbox45), hbox34, TRUE, TRUE, 0);
 
   label41 = gtk_label_new (_("URL:"));
   gtk_widget_show (label41);
@@ -3310,6 +3222,18 @@ create_addlocationdlg (void)
   gtk_entry_set_invisible_char (GTK_ENTRY (addlocation_entry), 8226);
   gtk_entry_set_activates_default (GTK_ENTRY (addlocation_entry), TRUE);
 
+  hbox122 = gtk_hbox_new (FALSE, 8);
+  gtk_box_pack_start (GTK_BOX (vbox45), hbox122, TRUE, TRUE, 0);
+
+  set_custom_title = gtk_check_button_new_with_mnemonic (_("Set Custom Title"));
+  gtk_widget_show (set_custom_title);
+  gtk_box_pack_start (GTK_BOX (hbox122), set_custom_title, FALSE, FALSE, 0);
+
+  custom_title = gtk_entry_new ();
+  gtk_widget_show (custom_title);
+  gtk_box_pack_start (GTK_BOX (hbox122), custom_title, TRUE, TRUE, 0);
+  gtk_entry_set_invisible_char (GTK_ENTRY (custom_title), 8226);
+
   addlocation_actionarea = gtk_dialog_get_action_area (GTK_DIALOG (addlocationdlg));
   gtk_widget_show (addlocation_actionarea);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (addlocation_actionarea), GTK_BUTTONBOX_END);
@@ -3359,9 +3283,13 @@ create_addlocationdlg (void)
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT_NO_REF (addlocationdlg, addlocationdlg, "addlocationdlg");
   GLADE_HOOKUP_OBJECT_NO_REF (addlocationdlg, dialog_vbox4, "dialog_vbox4");
+  GLADE_HOOKUP_OBJECT (addlocationdlg, vbox45, "vbox45");
   GLADE_HOOKUP_OBJECT (addlocationdlg, hbox34, "hbox34");
   GLADE_HOOKUP_OBJECT (addlocationdlg, label41, "label41");
   GLADE_HOOKUP_OBJECT (addlocationdlg, addlocation_entry, "addlocation_entry");
+  GLADE_HOOKUP_OBJECT (addlocationdlg, hbox122, "hbox122");
+  GLADE_HOOKUP_OBJECT (addlocationdlg, set_custom_title, "set_custom_title");
+  GLADE_HOOKUP_OBJECT (addlocationdlg, custom_title, "custom_title");
   GLADE_HOOKUP_OBJECT_NO_REF (addlocationdlg, addlocation_actionarea, "addlocation_actionarea");
   GLADE_HOOKUP_OBJECT (addlocationdlg, cancelbutton3, "cancelbutton3");
   GLADE_HOOKUP_OBJECT (addlocationdlg, alignment18, "alignment18");
@@ -4468,3 +4396,84 @@ create_select_action (void)
   return select_action;
 }
 
+GtkWidget*
+create_setcustomtitledlg (void)
+{
+  GtkWidget *setcustomtitledlg;
+  GtkWidget *dialog_vbox16;
+  GtkWidget *vbox46;
+  GtkWidget *textview2;
+  GtkWidget *hbox123;
+  GtkWidget *set_custom_title;
+  GtkWidget *custom_title;
+  GtkWidget *dialog_action_area15;
+  GtkWidget *cancelbutton11;
+  GtkWidget *okbutton11;
+
+  setcustomtitledlg = gtk_dialog_new ();
+  gtk_window_set_title (GTK_WINDOW (setcustomtitledlg), _("Set Custom Title"));
+  gtk_window_set_modal (GTK_WINDOW (setcustomtitledlg), TRUE);
+  gtk_window_set_type_hint (GTK_WINDOW (setcustomtitledlg), GDK_WINDOW_TYPE_HINT_DIALOG);
+
+  dialog_vbox16 = gtk_dialog_get_content_area (GTK_DIALOG (setcustomtitledlg));
+  gtk_widget_show (dialog_vbox16);
+
+  vbox46 = gtk_vbox_new (FALSE, 8);
+  gtk_widget_show (vbox46);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox16), vbox46, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox46), 12);
+
+  textview2 = gtk_text_view_new ();
+  gtk_widget_show (textview2);
+  gtk_box_pack_start (GTK_BOX (vbox46), textview2, FALSE, TRUE, 0);
+  gtk_text_view_set_editable (GTK_TEXT_VIEW (textview2), FALSE);
+  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textview2), GTK_WRAP_WORD);
+  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (textview2), FALSE);
+  gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW (textview2), 8);
+  gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (textview2), 8);
+  gtk_text_view_set_left_margin (GTK_TEXT_VIEW (textview2), 8);
+  gtk_text_view_set_right_margin (GTK_TEXT_VIEW (textview2), 8);
+  gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview2)), _("This dialog allows to set custom title for any track. This is most useful for radio stations. An option to set the custom title is also present in the \"Add Location\" dialog. The title itself is visible in columns displaying the \"Artist\" metadata field. It should look like \"[custom] artist\" if the Artist field is present, or just \"custom\" otherwise."), -1);
+
+  hbox123 = gtk_hbox_new (FALSE, 8);
+  gtk_widget_show (hbox123);
+  gtk_box_pack_start (GTK_BOX (vbox46), hbox123, FALSE, TRUE, 0);
+
+  set_custom_title = gtk_check_button_new_with_mnemonic (_("Set Custom Title"));
+  gtk_widget_show (set_custom_title);
+  gtk_box_pack_start (GTK_BOX (hbox123), set_custom_title, FALSE, FALSE, 0);
+
+  custom_title = gtk_entry_new ();
+  gtk_widget_show (custom_title);
+  gtk_box_pack_start (GTK_BOX (hbox123), custom_title, TRUE, TRUE, 0);
+  gtk_entry_set_invisible_char (GTK_ENTRY (custom_title), 8226);
+
+  dialog_action_area15 = gtk_dialog_get_action_area (GTK_DIALOG (setcustomtitledlg));
+  gtk_widget_show (dialog_action_area15);
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area15), GTK_BUTTONBOX_END);
+
+  cancelbutton11 = gtk_button_new_from_stock ("gtk-cancel");
+  gtk_widget_show (cancelbutton11);
+  gtk_dialog_add_action_widget (GTK_DIALOG (setcustomtitledlg), cancelbutton11, GTK_RESPONSE_CANCEL);
+  gtk_widget_set_can_default(cancelbutton11, TRUE);
+
+  okbutton11 = gtk_button_new_from_stock ("gtk-ok");
+  gtk_widget_show (okbutton11);
+  gtk_dialog_add_action_widget (GTK_DIALOG (setcustomtitledlg), okbutton11, GTK_RESPONSE_OK);
+  gtk_widget_set_can_default(okbutton11, TRUE);
+
+  /* Store pointers to all widgets, for use by lookup_widget(). */
+  GLADE_HOOKUP_OBJECT_NO_REF (setcustomtitledlg, setcustomtitledlg, "setcustomtitledlg");
+  GLADE_HOOKUP_OBJECT_NO_REF (setcustomtitledlg, dialog_vbox16, "dialog_vbox16");
+  GLADE_HOOKUP_OBJECT (setcustomtitledlg, vbox46, "vbox46");
+  GLADE_HOOKUP_OBJECT (setcustomtitledlg, textview2, "textview2");
+  GLADE_HOOKUP_OBJECT (setcustomtitledlg, hbox123, "hbox123");
+  GLADE_HOOKUP_OBJECT (setcustomtitledlg, set_custom_title, "set_custom_title");
+  GLADE_HOOKUP_OBJECT (setcustomtitledlg, custom_title, "custom_title");
+  GLADE_HOOKUP_OBJECT_NO_REF (setcustomtitledlg, dialog_action_area15, "dialog_action_area15");
+  GLADE_HOOKUP_OBJECT (setcustomtitledlg, cancelbutton11, "cancelbutton11");
+  GLADE_HOOKUP_OBJECT (setcustomtitledlg, okbutton11, "okbutton11");
+
+  return setcustomtitledlg;
+}
+
diff --git a/plugins/gtkui/interface.h b/plugins/gtkui/interface.h
index 9321b1d..dc9ead7 100644
--- a/plugins/gtkui/interface.h
+++ b/plugins/gtkui/interface.h
@@ -20,3 +20,4 @@ GtkWidget* create_ctmappingdlg (void);
 GtkWidget* create_ctmappingeditdlg (void);
 GtkWidget* create_button_properties (void);
 GtkWidget* create_select_action (void);
+GtkWidget* create_setcustomtitledlg (void);
diff --git a/plugins/gtkui/mainplaylist.c b/plugins/gtkui/mainplaylist.c
index d192002..35fb60b 100644
--- a/plugins/gtkui/mainplaylist.c
+++ b/plugins/gtkui/mainplaylist.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -64,9 +64,6 @@ main_get_cursor (void) {
 
 static void
 main_set_cursor (int cursor) {
-    char conf[100];
-    snprintf (conf, sizeof (conf), "playlist.cursor.%d", deadbeef->plt_get_curr_idx ());
-    deadbeef->conf_set_int (conf, cursor);
     return deadbeef->pl_set_cursor (PL_MAIN, cursor);
 }
 
@@ -253,6 +250,10 @@ main_column_size_changed (DdbListview *listview, int col) {
         return;
     }
     if (inf->id == DB_COLUMN_ALBUM_ART) {
+        if (listview->scrollpos > 0) {
+            int pos = ddb_listview_get_row_pos (listview, listview->ref_point);
+            gtk_range_set_value (GTK_RANGE (listview->scrollbar), pos - listview->ref_point_offset);
+        }
         coverart_reset_queue ();
         ddb_playlist_t *plt = deadbeef->plt_get_curr ();
         if (plt) {
@@ -275,10 +276,11 @@ void main_col_free_user_data (void *data) {
 void
 main_vscroll_changed (int pos) {
     coverart_reset_queue ();
-    int curr = deadbeef->plt_get_curr_idx ();
-    char conf[100];
-    snprintf (conf, sizeof (conf), "playlist.scroll.%d", curr);
-    deadbeef->conf_set_int (conf, pos);
+    ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+    if (plt) {
+        deadbeef->plt_set_scroll (plt, pos);
+        deadbeef->plt_unref (plt);
+    }
 }
 
 void
@@ -347,7 +349,7 @@ main_playlist_init (GtkWidget *widget) {
     DB_conf_item_t *col = deadbeef->conf_find ("playlist.column.", NULL);
     if (!col) {
         // create default set of columns
-        add_column_helper (listview, _("Playing"), 50, DB_COLUMN_PLAYING, NULL, 0);
+        add_column_helper (listview, "♫", 50, DB_COLUMN_PLAYING, NULL, 0);
         add_column_helper (listview, _("Artist / Album"), 150, -1, "%a - %b", 0);
         add_column_helper (listview, _("Track No"), 50, -1, "%n", 1);
         add_column_helper (listview, _("Title"), 150, -1, "%t", 0);
@@ -375,6 +377,8 @@ main_playlist_init (GtkWidget *widget) {
     strncpy (group_by_str, deadbeef->conf_get_str_fast ("playlist.group_by", ""), sizeof (group_by_str));
     deadbeef->conf_unlock ();
     group_by_str[sizeof (group_by_str)-1] = 0;
+
+    gtkui_groups_pinned = deadbeef->conf_get_int ("playlist.pin.groups", 0);
 }
 
 void
diff --git a/plugins/gtkui/mainplaylist.h b/plugins/gtkui/mainplaylist.h
index a746b39..cb30586 100644
--- a/plugins/gtkui/mainplaylist.h
+++ b/plugins/gtkui/mainplaylist.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/plcommon.c b/plugins/gtkui/plcommon.c
index 2e72155..9545abd 100644
--- a/plugins/gtkui/plcommon.c
+++ b/plugins/gtkui/plcommon.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -32,11 +32,15 @@
 #include "actions.h"
 #include "search.h"
 #include "actionhandlers.h"
+#include "../../strdupa.h"
 
 #define min(x,y) ((x)<(y)?(x):(y))
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
+// disable custom title function, until we have new title formatting (0.7)
+#define DISABLE_CUSTOM_TITLE
+
 char group_by_str[MAX_GROUP_BY_STR];
 
 extern GtkWidget *theme_treeview;
@@ -169,16 +173,16 @@ void draw_column_data (DdbListview *listview, cairo_t *cr, DdbListviewIter it, D
     if (cinf->id == DB_COLUMN_ALBUM_ART) {
         if (theming) {
 #if GTK_CHECK_VERSION(3,0,0)
-            cairo_rectangle (cr, x, y, width, height);
+            cairo_rectangle (cr, x, y, width, MAX (height,minheight));
             cairo_clip (cr);
-            gtk_paint_flat_box (gtk_widget_get_style (theme_treeview), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, theme_treeview, "cell_even_ruled", x-1, y, width+2, height);
+            gtk_paint_flat_box (gtk_widget_get_style (theme_treeview), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, theme_treeview, "cell_even_ruled", x-1, y, width+2, MAX (height,minheight));
             cairo_reset_clip (cr);
 #else
             GdkRectangle clip = {
                 .x = x,
                 .y = y,
                 .width = width,
-                .height = height,
+                .height = MAX (height,minheight),
             };
             gtk_paint_flat_box (gtk_widget_get_style (theme_treeview), gtk_widget_get_window (listview->list), GTK_STATE_NORMAL, GTK_SHADOW_NONE, &clip, theme_treeview, "cell_even_ruled", x-1, y, width+2, height);
 #endif
@@ -236,29 +240,22 @@ void draw_column_data (DdbListview *listview, cairo_t *cr, DdbListviewIter it, D
                 art_width = gdk_pixbuf_get_width (pixbuf);
                 float art_scale = (float)real_art_width / art_width;
                 int pw = real_art_width;
-                int ph;
+                int ph = pw;
                 if (gdk_pixbuf_get_width (pixbuf) < gdk_pixbuf_get_height (pixbuf)) {
                     art_scale *= (float)gdk_pixbuf_get_width (pixbuf) / gdk_pixbuf_get_height (pixbuf);
                 }
 
-                if (group_pinned == 1 && gtkui_groups_pinned) {
-                    ph = group_height;
-                }
-                else {
-                    ph = pw;
-                }
-
-                if (sy < ph)
-                {
+                int draw_pinned = (y - listview->grouptitle_height < ph && group_pinned == 1 && gtkui_groups_pinned) ? 1 : 0;
+                if (art_y > -(ph + listview->grouptitle_height) || draw_pinned) {
                     cairo_save (cr);
-                    if (group_pinned == 1 && gtkui_groups_pinned) {
-                        int ph_real = gdk_pixbuf_get_height (pixbuf);
-                        if (grp_next_y <= ph_real * art_scale + listview->grouptitle_height) {
-                            cairo_rectangle (cr, x + ART_PADDING_HORZ, grp_next_y - ph_real * art_scale, pw, ph);
-                            cairo_translate (cr, (x + ART_PADDING_HORZ)-0, grp_next_y - ph_real * art_scale);
+                    if (draw_pinned) {
+                        int ph_real = gdk_pixbuf_get_height (pixbuf) * art_scale;
+                        if (grp_next_y <= ph_real + listview->grouptitle_height) {
+                            cairo_rectangle (cr, x + ART_PADDING_HORZ, grp_next_y - ph_real, pw, ph_real);
+                            cairo_translate (cr, (x + ART_PADDING_HORZ)-0, grp_next_y - ph_real);
                         }
                         else {
-                            cairo_rectangle (cr, x + ART_PADDING_HORZ, listview->grouptitle_height, pw, ph);
+                            cairo_rectangle (cr, x + ART_PADDING_HORZ, listview->grouptitle_height, pw, ph_real);
                             cairo_translate (cr, (x + ART_PADDING_HORZ)-0, listview->grouptitle_height);
                         }
                     }
@@ -278,7 +275,7 @@ void draw_column_data (DdbListview *listview, cairo_t *cr, DdbListviewIter it, D
             }
         }
     }
-    else if (it && it == playing_track && cinf->id == DB_COLUMN_PLAYING) {
+    else if (!gtkui_unicode_playstate && it && it == playing_track && cinf->id == DB_COLUMN_PLAYING) {
         int paused = deadbeef->get_output ()->state () == OUTPUT_STATE_PAUSED;
         int buffering = !deadbeef->streamer_ok_to_read (-1);
         GdkPixbuf *pixbuf;
@@ -296,15 +293,30 @@ void draw_column_data (DdbListview *listview, cairo_t *cr, DdbListviewIter it, D
         cairo_fill (cr);
     }
     else if (it) {
-        char text[1024];
-        deadbeef->pl_format_title (it, -1, text, sizeof (text), cinf->id, cinf->format);
-        char *lb = strchr (text, '\r');
-        if (lb) {
-            *lb = 0;
+        char text[1024] = "";
+        if (it == playing_track && cinf->id == DB_COLUMN_PLAYING) {
+            int paused = deadbeef->get_output ()->state () == OUTPUT_STATE_PAUSED;
+            int buffering = !deadbeef->streamer_ok_to_read (-1);
+            if (paused) {
+                strcpy (text, "||");
+            }
+            else if (!buffering) {
+                strcpy (text, "►");
+            }
+            else {
+                strcpy (text, "⋯⋯⋯");
+            }
         }
-        lb = strchr (text, '\n');
-        if (lb) {
-            *lb = 0;
+        else {
+            deadbeef->pl_format_title (it, -1, text, sizeof (text), cinf->id, cinf->format);
+            char *lb = strchr (text, '\r');
+            if (lb) {
+                *lb = 0;
+            }
+            lb = strchr (text, '\n');
+            if (lb) {
+                *lb = 0;
+            }
         }
         GdkColor *color = NULL;
         if (theming) {
@@ -332,7 +344,7 @@ void draw_column_data (DdbListview *listview, cairo_t *cr, DdbListviewIter it, D
             draw_init_font_bold (&listview->listctx);
         }
         if (calign_right) {
-            draw_text (&listview->listctx, x+5, y + 3, cwidth-10, 1, text);
+            draw_text (&listview->listctx, x + 5, y + 3, cwidth-10, 1, text);
         }
         else {
             draw_text (&listview->listctx, x + 5, y + 3, cwidth-10, 0, text);
@@ -458,6 +470,72 @@ on_remove2_activate                    (GtkMenuItem     *menuitem,
     deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
 }
 
+static void
+on_toggle_set_custom_title (GtkToggleButton *togglebutton, gpointer user_data) {
+    gboolean active = gtk_toggle_button_get_active (togglebutton);
+    deadbeef->conf_set_int ("gtkui.location_set_custom_title", active);
+
+    GtkWidget *ct = lookup_widget (GTK_WIDGET (user_data), "custom_title");
+    gtk_widget_set_sensitive (ct, active);
+
+    deadbeef->conf_save ();
+}
+
+#ifndef DISABLE_CUSTOM_TITLE
+void
+on_set_custom_title_activate (GtkMenuItem *menuitem, gpointer user_data)
+{
+    DdbListview *lv = user_data;
+    int idx = lv->binding->cursor ();
+    if (idx < 0) {
+        return;
+    }
+    DdbListviewIter it = lv->binding->get_for_idx (idx);
+    if (!it) {
+        return;
+    }
+
+    GtkWidget *dlg = create_setcustomtitledlg ();
+    GtkWidget *sct = lookup_widget (dlg, "set_custom_title");
+    GtkWidget *ct = lookup_widget (dlg, "custom_title");
+    if (deadbeef->conf_get_int ("gtkui.location_set_custom_title", 0)) {
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sct), TRUE);
+        gtk_widget_set_sensitive (ct, TRUE);
+    }
+    else {
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sct), FALSE);
+        gtk_widget_set_sensitive (ct, FALSE);
+    }
+    deadbeef->pl_lock ();
+    const char *custom_title = deadbeef->pl_find_meta ((DB_playItem_t *)it, ":CUSTOM_TITLE");
+    if (custom_title) {
+        custom_title = strdupa (custom_title);
+    }
+    else {
+        custom_title = "";
+    }
+    deadbeef->pl_unlock ();
+
+    g_signal_connect ((gpointer) sct, "toggled",
+            G_CALLBACK (on_toggle_set_custom_title),
+            dlg);
+    gtk_entry_set_text (GTK_ENTRY (ct), custom_title);
+
+    gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
+    gint response = gtk_dialog_run (GTK_DIALOG (dlg));
+    if (response == GTK_RESPONSE_OK) {
+        if (it && deadbeef->conf_get_int ("gtkui.location_set_custom_title", 0)) {
+            deadbeef->pl_replace_meta ((DB_playItem_t *)it, ":CUSTOM_TITLE", gtk_entry_get_text (GTK_ENTRY (ct)));
+        }
+        else {
+            deadbeef->pl_delete_meta ((DB_playItem_t *)it, ":CUSTOM_TITLE");
+        }
+    }
+    gtk_widget_destroy (dlg);
+    lv->binding->unref (it);
+}
+#endif
+
 void
 on_remove_from_disk_activate                    (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
@@ -545,20 +623,23 @@ list_context_menu (DdbListview *listview, DdbListviewIter it, int idx) {
     GtkWidget *playlist_menu;
     GtkWidget *add_to_playback_queue1;
     GtkWidget *remove_from_playback_queue1;
-    GtkWidget *separator9;
+    GtkWidget *separator;
     GtkWidget *remove2;
     GtkWidget *remove_from_disk;
     GtkWidget *separator8;
     GtkWidget *properties1;
     GtkWidget *reload_metadata;
+#ifndef DISABLE_CUSTOM_TITLE
+    GtkWidget *set_custom_title;
+#endif
 
     playlist_menu = gtk_menu_new ();
-    add_to_playback_queue1 = gtk_menu_item_new_with_mnemonic (_("Add to playback queue"));
+    add_to_playback_queue1 = gtk_menu_item_new_with_mnemonic (_("Add To Playback Queue"));
     gtk_widget_show (add_to_playback_queue1);
     gtk_container_add (GTK_CONTAINER (playlist_menu), add_to_playback_queue1);
     g_object_set_data (G_OBJECT (add_to_playback_queue1), "ps", listview);
 
-    remove_from_playback_queue1 = gtk_menu_item_new_with_mnemonic (_("Remove from playback queue"));
+    remove_from_playback_queue1 = gtk_menu_item_new_with_mnemonic (_("Remove From Playback Queue"));
     if (inqueue == -1) {
         gtk_widget_set_sensitive (remove_from_playback_queue1, FALSE);
     }
@@ -566,15 +647,15 @@ list_context_menu (DdbListview *listview, DdbListviewIter it, int idx) {
     gtk_container_add (GTK_CONTAINER (playlist_menu), remove_from_playback_queue1);
     g_object_set_data (G_OBJECT (remove_from_playback_queue1), "ps", listview);
 
-    reload_metadata = gtk_menu_item_new_with_mnemonic (_("Reload metadata"));
+    reload_metadata = gtk_menu_item_new_with_mnemonic (_("Reload Metadata"));
     gtk_widget_show (reload_metadata);
     gtk_container_add (GTK_CONTAINER (playlist_menu), reload_metadata);
     g_object_set_data (G_OBJECT (reload_metadata), "ps", listview);
 
-    separator9 = gtk_separator_menu_item_new ();
-    gtk_widget_show (separator9);
-    gtk_container_add (GTK_CONTAINER (playlist_menu), separator9);
-    gtk_widget_set_sensitive (separator9, FALSE);
+    separator = gtk_separator_menu_item_new ();
+    gtk_widget_show (separator);
+    gtk_container_add (GTK_CONTAINER (playlist_menu), separator);
+    gtk_widget_set_sensitive (separator, FALSE);
 
     remove2 = gtk_menu_item_new_with_mnemonic (_("Remove"));
     gtk_widget_show (remove2);
@@ -584,16 +665,16 @@ list_context_menu (DdbListview *listview, DdbListviewIter it, int idx) {
     int hide_remove_from_disk = deadbeef->conf_get_int ("gtkui.hide_remove_from_disk", 0);
 
     if (!hide_remove_from_disk) {
-        remove_from_disk = gtk_menu_item_new_with_mnemonic (_("Remove from disk"));
+        remove_from_disk = gtk_menu_item_new_with_mnemonic (_("Remove From Disk"));
         gtk_widget_show (remove_from_disk);
         gtk_container_add (GTK_CONTAINER (playlist_menu), remove_from_disk);
         g_object_set_data (G_OBJECT (remove_from_disk), "ps", listview);
     }
 
-    separator8 = gtk_separator_menu_item_new ();
-    gtk_widget_show (separator8);
-    gtk_container_add (GTK_CONTAINER (playlist_menu), separator8);
-    gtk_widget_set_sensitive (separator8, FALSE);
+    separator = gtk_separator_menu_item_new ();
+    gtk_widget_show (separator);
+    gtk_container_add (GTK_CONTAINER (playlist_menu), separator);
+    gtk_widget_set_sensitive (separator, FALSE);
 
     int selected_count = 0;
     DB_playItem_t *pit = deadbeef->pl_get_first (PL_MAIN);
@@ -721,8 +802,21 @@ list_context_menu (DdbListview *listview, DdbListviewIter it, int idx) {
         gtk_widget_set_sensitive (separator8, FALSE);
     }
 
+#ifndef DISABLE_CUSTOM_TITLE
+    set_custom_title = gtk_menu_item_new_with_mnemonic (_("Set Custom Title"));
+    gtk_widget_show (set_custom_title);
+    gtk_container_add (GTK_CONTAINER (playlist_menu), set_custom_title);
+    if (selected_count != 1) {
+        gtk_widget_set_sensitive (GTK_WIDGET (set_custom_title), FALSE);
+    }
+
+    separator = gtk_separator_menu_item_new ();
+    gtk_widget_show (separator);
+    gtk_container_add (GTK_CONTAINER (playlist_menu), separator);
+    gtk_widget_set_sensitive (separator, FALSE);
+#endif
 
-    properties1 = gtk_menu_item_new_with_mnemonic (_("Properties"));
+    properties1 = gtk_menu_item_new_with_mnemonic (_("Track Properties"));
     gtk_widget_show (properties1);
     gtk_container_add (GTK_CONTAINER (playlist_menu), properties1);
     g_object_set_data (G_OBJECT (properties1), "ps", listview);
@@ -744,6 +838,11 @@ list_context_menu (DdbListview *listview, DdbListviewIter it, int idx) {
                 G_CALLBACK (on_remove_from_disk_activate),
                 NULL);
     }
+#ifndef DISABLE_CUSTOM_TITLE
+    g_signal_connect ((gpointer) set_custom_title, "activate",
+            G_CALLBACK (on_set_custom_title_activate),
+            listview);
+#endif
     g_signal_connect ((gpointer) properties1, "activate",
             G_CALLBACK (main_properties_activate),
             NULL);
@@ -769,9 +868,8 @@ void
 on_pin_groups_active                   (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-    gboolean act = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem));
     int old_val = deadbeef->conf_get_int ("playlist.pin.groups", 0);
-    deadbeef->conf_set_int ("playlist.pin.groups", 1-old_val);
+    deadbeef->conf_set_int ("playlist.pin.groups", old_val ? 0 : 1);
     deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
     gtk_check_menu_item_toggled(GTK_CHECK_MENU_ITEM(menuitem));
     ddb_playlist_t *plt = deadbeef->plt_get_curr ();
@@ -1031,8 +1129,6 @@ on_edit_column_activate                (GtkMenuItem     *menuitem,
         return;
     }
 
-    gtk_entry_set_text (GTK_ENTRY (lookup_widget (dlg, "title")), title);
-    editcolumn_title_changed = 0;
     int idx = 10;
     if (inf->id == -1) {
         if (inf->format) {
@@ -1070,6 +1166,8 @@ on_edit_column_activate                (GtkMenuItem     *menuitem,
         gtk_entry_set_text (GTK_ENTRY (lookup_widget (dlg, "format")), inf->format);
     }
     gtk_combo_box_set_active (GTK_COMBO_BOX (lookup_widget (dlg, "align")), align_right);
+    gtk_entry_set_text (GTK_ENTRY (lookup_widget (dlg, "title")), title);
+    editcolumn_title_changed = 0;
     gint response = gtk_dialog_run (GTK_DIALOG (dlg));
     if (response == GTK_RESPONSE_OK) {
         const gchar *title = gtk_entry_get_text (GTK_ENTRY (lookup_widget (dlg, "title")));
diff --git a/plugins/gtkui/plcommon.h b/plugins/gtkui/plcommon.h
index 3f82a73..6f5f7ae 100644
--- a/plugins/gtkui/plcommon.h
+++ b/plugins/gtkui/plcommon.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -21,11 +21,6 @@
 
 #include "ddblistview.h"
 
-typedef struct {
-    int id;
-    char *format;
-} col_info_t;
-
 #define MAX_GROUP_BY_STR 100
 extern char group_by_str[MAX_GROUP_BY_STR];
 
diff --git a/plugins/gtkui/pltmenu.c b/plugins/gtkui/pltmenu.c
index 6fd803a..1393bbe 100644
--- a/plugins/gtkui/pltmenu.c
+++ b/plugins/gtkui/pltmenu.c
@@ -150,6 +150,9 @@ add_tab_actions (GtkWidget *menu) {
     int i;
 
     int added_entries = 0;
+
+    int hide_remove_from_disk = deadbeef->conf_get_int ("gtkui.hide_remove_from_disk", 0);
+
     for (i = 0; plugins[i]; i++)
     {
         if (!plugins[i]->get_actions)
@@ -165,6 +168,10 @@ add_tab_actions (GtkWidget *menu) {
             if (!(action->flags & DB_ACTION_MULTIPLE_TRACKS))
                 continue;
 
+            if (action->name && !strcmp (action->name, "delete_from_disk") && hide_remove_from_disk) {
+                continue;
+            }
+
             // create submenus (separated with '/')
             const char *prev = action->title;
             while (*prev && *prev == '/') {
diff --git a/plugins/gtkui/pluginconf.c b/plugins/gtkui/pluginconf.c
index beb3630..b933d69 100644
--- a/plugins/gtkui/pluginconf.c
+++ b/plugins/gtkui/pluginconf.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/pluginconf.h b/plugins/gtkui/pluginconf.h
index 6717aa2..21a08ed 100644
--- a/plugins/gtkui/pluginconf.h
+++ b/plugins/gtkui/pluginconf.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/prefwin.c b/plugins/gtkui/prefwin.c
index 850de34..84f668c 100644
--- a/plugins/gtkui/prefwin.c
+++ b/plugins/gtkui/prefwin.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -215,6 +215,9 @@ gtkui_run_preferences_dlg (void) {
     // reset autostop
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "reset_autostop")), deadbeef->conf_get_int ("playlist.stop_after_current_reset", 0));
 
+    // reset album autostop
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "reset_autostopalbum")), deadbeef->conf_get_int ("playlist.stop_after_album_reset", 0));
+
     // titlebar text
     gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "titlebar_format_playing")), deadbeef->conf_get_str_fast ("gtkui.titlebar_playing", "%a - %t - DeaDBeeF-%V"));
     gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "titlebar_format_stopped")), deadbeef->conf_get_str_fast ("gtkui.titlebar_stopped", "DeaDBeeF-%V"));
@@ -228,6 +231,9 @@ gtkui_run_preferences_dlg (void) {
     // resume last session
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "resume_last_session")), deadbeef->conf_get_int ("resume_last_session", 0));
 
+    // enable shift-jis recoding
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "enable_shift_jis_recoding")), deadbeef->conf_get_int ("junk.enable_shift_jis_detection", 0));
+
     // enable cp1251 recoding
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "enable_cp1251_recoding")), deadbeef->conf_get_int ("junk.enable_cp1251_detection", 1));
 
@@ -333,10 +339,6 @@ gtkui_run_preferences_dlg (void) {
     gtk_widget_set_sensitive (lookup_widget (prefwin, "configure_plugin"), FALSE);
 
     // hotkeys
-//    DB_plugin_t *hotkeys = deadbeef->plug_get_for_id ("hotkeys");
-//    if (hotkeys) {
-//        prefwin_add_hotkeys_tab (prefwin);
-//    }
     prefwin_init_hotkeys (prefwin);
 
     deadbeef->conf_unlock ();
@@ -777,8 +779,6 @@ on_override_bar_colors_toggled         (GtkToggleButton *togglebutton,
     deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
     gtkui_init_theme_colors ();
     prefwin_init_theme_colors ();
-    seekbar_redraw ();
-    volumebar_redraw ();
     eq_redraw ();
 }
 
@@ -866,19 +866,6 @@ on_proxypassword_changed               (GtkEditable     *editable,
 }
 
 
-gboolean
-on_prefwin_key_press_event             (GtkWidget       *widget,
-                                        GdkEventKey     *event,
-                                        gpointer         user_data)
-{
-    if (event->keyval == GDK_Escape) {
-        gtk_widget_hide (widget);
-        gtk_widget_destroy (widget);
-    }
-    return FALSE;
-}
-
-
 void
 on_embolden_current_toggled            (GtkToggleButton *togglebutton,
                                         gpointer         user_data)
@@ -940,6 +927,15 @@ on_resume_last_session_toggled         (GtkToggleButton *togglebutton,
 }
 
 void
+on_enable_shift_jis_recoding_toggled   (GtkToggleButton *togglebutton,
+                                        gpointer         user_data)
+{
+    int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
+    deadbeef->conf_set_int ("junk.enable_shift_jis_detection", active);
+    deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
 on_enable_cp1251_recoding_toggled      (GtkToggleButton *togglebutton,
                                         gpointer         user_data)
 {
@@ -1056,7 +1052,7 @@ on_gui_fps_value_changed           (GtkRange        *range,
 {
     int val = gtk_range_get_value (range);
     deadbeef->conf_set_int ("gtkui.refresh_rate", val);
-    gtkui_setup_gui_refresh ();
+    deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
 }
 
 void
@@ -1074,6 +1070,13 @@ on_reset_autostop_toggled              (GtkToggleButton *togglebutton,
     deadbeef->conf_set_int ("playlist.stop_after_current_reset", gtk_toggle_button_get_active (togglebutton));
 }
 
+void
+on_reset_autostopalbum_toggled         (GtkToggleButton *togglebutton,
+                                        gpointer         user_data)
+{
+    deadbeef->conf_set_int ("playlist.stop_after_album_reset", gtk_toggle_button_get_active (togglebutton));
+}
+
 
 
 void
diff --git a/plugins/gtkui/progress.c b/plugins/gtkui/progress.c
index 80dbcf1..7922777 100644
--- a/plugins/gtkui/progress.c
+++ b/plugins/gtkui/progress.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software: you can redistribute it and/or modify
@@ -78,6 +78,9 @@ progress_destroy (void) {
 
 void
 progress_settext (const char *text) {
+    if (deadbeef->junk_detect_charset (text)) {
+        text = "...";
+    }
     gtk_entry_set_text (GTK_ENTRY (progressitem), text);
 }
 
diff --git a/plugins/gtkui/progress.h b/plugins/gtkui/progress.h
index 9d550e6..e74026c 100644
--- a/plugins/gtkui/progress.h
+++ b/plugins/gtkui/progress.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software: you can redistribute it and/or modify
diff --git a/plugins/gtkui/retina.m b/plugins/gtkui/retina.m
new file mode 100644
index 0000000..b76c232
--- /dev/null
+++ b/plugins/gtkui/retina.m
@@ -0,0 +1,14 @@
+#include <Cocoa/Cocoa.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkquartz.h>
+#include "retina.h"
+
+int
+is_retina (GtkWidget *w) {
+    NSWindow *window = gdk_quartz_window_get_nswindow (gtk_widget_get_window (w));
+    if ([window respondsToSelector:@selector(backingScaleFactor)]) {
+        float s = [window backingScaleFactor];
+        return s > 1.0f;
+    }
+    return 0; 
+}
diff --git a/plugins/gtkui/search.c b/plugins/gtkui/search.c
index ed0d69e..f91c991 100644
--- a/plugins/gtkui/search.c
+++ b/plugins/gtkui/search.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software: you can redistribute it and/or modify
@@ -189,18 +189,14 @@ on_searchwin_key_press_event           (GtkWidget       *widget,
 {
     // that's for when user attempts to navigate list while entry has focus
     if (event->keyval == GDK_Escape) {
-        gtk_widget_hide (widget);
+        gtk_widget_hide (searchwin);
+        return TRUE;
     }
     else if (event->keyval == GDK_Return) {
         on_searchentry_activate (NULL, 0);
+        return TRUE;
     }
-    else if (event->keyval != GDK_Delete && event->keyval != GDK_Home && event->keyval != GDK_End){
-        GtkWidget *pl = lookup_widget (searchwin, "searchlist");
-        if (!ddb_listview_handle_keypress (DDB_LISTVIEW (pl), event->keyval, event->state)) {
-            return on_mainwin_key_press_event (widget, event, user_data);
-        }
-    }
-    return TRUE;
+    return FALSE;
 }
 
 gboolean
@@ -411,6 +407,7 @@ DdbListviewBinding search_binding = {
 void
 search_playlist_init (GtkWidget *widget) {
     DdbListview *listview = DDB_LISTVIEW(widget);
+    g_signal_connect ((gpointer)listview->list, "key_press_event", G_CALLBACK (on_searchwin_key_press_event), listview);
     search_binding.ref = (void (*) (DdbListviewIter))deadbeef->pl_item_ref;
     search_binding.unref = (void (*) (DdbListviewIter))deadbeef->pl_item_unref;
     search_binding.is_selected = (int (*) (DdbListviewIter))deadbeef->pl_is_selected;
diff --git a/plugins/gtkui/search.h b/plugins/gtkui/search.h
index 18a5239..e3c9bff 100644
--- a/plugins/gtkui/search.h
+++ b/plugins/gtkui/search.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software: you can redistribute it and/or modify
diff --git a/plugins/gtkui/support.h b/plugins/gtkui/support.h
index a4e8088..0410f15 100644
--- a/plugins/gtkui/support.h
+++ b/plugins/gtkui/support.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/tagwritersettings.c b/plugins/gtkui/tagwritersettings.c
index 57b4259..6ffc568 100644
--- a/plugins/gtkui/tagwritersettings.c
+++ b/plugins/gtkui/tagwritersettings.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/tagwritersettings.h b/plugins/gtkui/tagwritersettings.h
index 9686c5f..0e97148 100644
--- a/plugins/gtkui/tagwritersettings.h
+++ b/plugins/gtkui/tagwritersettings.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/trkproperties.c b/plugins/gtkui/trkproperties.c
index 8ab5981..6359d5c 100644
--- a/plugins/gtkui/trkproperties.c
+++ b/plugins/gtkui/trkproperties.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -243,8 +243,18 @@ on_metadata_edited (GtkCellRendererText *renderer, gchar *path, gchar *new_text,
     GtkListStore *store = GTK_LIST_STORE (user_data);
     GtkTreePath *treepath = gtk_tree_path_new_from_string (path);
     GtkTreeIter iter;
-    gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, treepath);
+
+    if (!treepath) {
+        return;
+    }
+
+    gboolean valid = gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, treepath);
     gtk_tree_path_free (treepath);
+
+    if (!valid) {
+        return;
+    }
+
     GValue value = {0,};
     GValue mult = {0,};
     gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 1, &value);
@@ -428,7 +438,7 @@ show_track_properties_dlg (int ctx) {
 
     tracks = malloc (sizeof (DB_playItem_t *) * num);
     if (!tracks) {
-        fprintf (stderr, "gtkui: failed to alloc %d bytes to store selected tracks\n", num * sizeof (void *));
+        fprintf (stderr, "gtkui: failed to alloc %d bytes to store selected tracks\n", (int)(num * sizeof (void *)));
         deadbeef->pl_unlock ();
         return;
     }
diff --git a/plugins/gtkui/trkproperties.h b/plugins/gtkui/trkproperties.h
index 8d438c8..acedb32 100644
--- a/plugins/gtkui/trkproperties.h
+++ b/plugins/gtkui/trkproperties.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/widgets.c b/plugins/gtkui/widgets.c
index b8e9481..61db909 100644
--- a/plugins/gtkui/widgets.c
+++ b/plugins/gtkui/widgets.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2011 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -37,8 +37,11 @@
 #include "namedicons.h"
 #include "hotkeys.h" // for building action treeview
 #include "../../strdupa.h"
-#include "../../optmath.h"
+#include "../../fastftoi.h"
 #include "actions.h"
+#include "ddbseekbar.h"
+#include "ddbvolumebar.h"
+#include "callbacks.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
@@ -193,6 +196,27 @@ typedef struct {
     unsigned use_textcolor : 1;
 } w_button_t;
 
+typedef struct {
+    ddb_gtkui_widget_t base;
+    GtkWidget *seekbar;
+    gint timer;
+    float last_songpos;
+} w_seekbar_t;
+
+typedef struct {
+    ddb_gtkui_widget_t base;
+} w_playtb_t;
+
+typedef struct {
+    ddb_gtkui_widget_t base;
+    GtkWidget *volumebar;
+} w_volumebar_t;
+
+typedef struct {
+    ddb_gtkui_widget_t base;
+    GtkWidget *voices[8];
+} w_ctvoices_t;
+
 static int design_mode;
 static ddb_gtkui_widget_t *rootwidget;
 
@@ -315,6 +339,145 @@ w_replace (ddb_gtkui_widget_t *w, ddb_gtkui_widget_t *from, ddb_gtkui_widget_t *
     }
 }
 
+// unknown widget wrapper
+typedef struct {
+    ddb_gtkui_widget_t base;
+    GtkWidget *drawarea;
+    char *expected_type;
+    char *parms;
+    char *children;
+} w_unknown_t;
+
+const char *
+w_unknown_load (struct ddb_gtkui_widget_s *base, const char *type, const char *s) {
+    w_unknown_t *w = (w_unknown_t *)base;
+    char buffer_parms[4000];
+    char buffer_children[4000];
+
+    const char *p = s;
+    while (*p && *p != '{') {
+        p++;
+    }
+
+    if (!(*p)) {
+        fprintf (stderr, "reached EOL before expected { while trying to load unknown widget %s\n", w->expected_type);
+        return NULL;
+    }
+
+    if (p - s + 1 > sizeof (buffer_parms)) {
+        fprintf (stderr, "buffer to small to load unknown widget %s\n", w->expected_type);
+        return NULL;
+    }
+
+    memcpy (buffer_parms, s, p-s);
+    buffer_parms[p-s] = 0;
+
+    p++;
+    s = p;
+
+    int nb = 1;
+    while (*p) {
+        if (*p == '{') {
+            nb++;
+        }
+        if (*p == '}') {
+            nb--;
+            if (nb == 0) {
+                break;
+            }
+        }
+        p++;
+    }
+    if (!(*p)) {
+        fprintf (stderr, "reached EOL before expected } while trying to load unknown widget %s\n", w->expected_type);
+        return NULL;
+    }
+    if (p - s + 1 > sizeof (buffer_parms)) {
+        fprintf (stderr, "buffer to small to load unknown widget %s\n", w->expected_type);
+        return NULL;
+    }
+    memcpy (buffer_children, s, p-s);
+    buffer_children[p-s] = 0;
+
+    w->parms = strdup (buffer_parms);
+    w->children = strdup (buffer_children);
+
+    // caller expects 's' to point to '}'
+    return p;
+}
+
+static void
+w_unknown_save (struct ddb_gtkui_widget_s *base, char *s, int sz) {
+    w_unknown_t *w = (w_unknown_t *)base;
+    int l = strlen (s);
+    s += l;
+    sz -= l;
+    snprintf (s, sz, "%s%s {%s}", w->expected_type, w->parms, w->children);
+}
+
+void w_unknown_destroy (ddb_gtkui_widget_t *_w) {
+    w_unknown_t *w = (w_unknown_t *)_w;
+    if (w->expected_type) {
+        free (w->expected_type);
+        w->expected_type = NULL;
+    }
+    if (w->parms) {
+        free (w->parms);
+        w->parms = NULL;
+    }
+    if (w->children) {
+        free (w->children);
+        w->children = NULL;
+    }
+}
+
+static gboolean
+unknown_draw (GtkWidget *widget, cairo_t *cr, gpointer user_data) {
+    ddb_gtkui_widget_t *w = user_data;
+    cairo_set_source_rgb(cr, 0.1, 0.1, 0.1);
+
+    cairo_set_font_size(cr, 16);
+
+    cairo_move_to(cr, 20, 30);
+
+    char s[1000];
+    snprintf (s, sizeof (s), _("Widget \"%s\" is not available"), ((w_unknown_t *)w)->expected_type);
+
+    cairo_show_text(cr, s);
+    return TRUE;
+}
+
+static gboolean
+unknown_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) {
+    cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
+    gboolean res = unknown_draw (widget, cr, user_data);
+    cairo_destroy (cr);
+    return res;
+}
+
+ddb_gtkui_widget_t *
+w_unknown_create (const char *type) {
+    w_unknown_t *w = malloc (sizeof (w_unknown_t));
+    memset (w, 0, sizeof (w_unknown_t));
+    w->base.type = "unknown";
+    w->base.load = w_unknown_load;
+    w->base.save = w_unknown_save;
+    w->base.destroy = w_unknown_destroy;
+    w->expected_type = strdup (type);
+
+    w->base.widget = gtk_event_box_new ();
+    w->drawarea = gtk_drawing_area_new ();
+    gtk_widget_show (w->drawarea);
+    gtk_container_add (GTK_CONTAINER (w->base.widget), w->drawarea);
+#if !GTK_CHECK_VERSION(3,0,0)
+    g_signal_connect_after ((gpointer) w->drawarea, "expose_event", G_CALLBACK (unknown_expose_event), w);
+#else
+    g_signal_connect_after ((gpointer) w->drawarea, "draw", G_CALLBACK (unknown_draw), w);
+#endif
+    w_override_signals (w->base.widget, w);
+    return (ddb_gtkui_widget_t *)w;
+}
+
 const char *
 w_create_from_string (const char *s, ddb_gtkui_widget_t **parent) {
     char t[MAX_TOKEN];
@@ -325,8 +488,7 @@ w_create_from_string (const char *s, ddb_gtkui_widget_t **parent) {
     char *type = strdupa (t);
     ddb_gtkui_widget_t *w = w_create (type);
     if (!w) {
-        fprintf (stderr, "failed to create widget for type %s\n", t);
-        return NULL;
+        w = w_unknown_create (type);
     }
     // nuke all default children
     while (w->children) {
@@ -440,10 +602,17 @@ static char paste_buffer[20000];
 
 void
 save_widget_to_string (char *str, int sz, ddb_gtkui_widget_t *w) {
+    // uknown is special case
+    if (!strcmp (w->type, "unknown")) {
+        w->save (w, str, sz);
+        return;
+    }
+
     strcat (str, w->type);
     if (w->save) {
         w->save (w, str, sz);
     }
+
     strcat (str, " {");
     for (ddb_gtkui_widget_t *c = w->children; c; c = c->next) {
         save_widget_to_string (str, sz, c);
@@ -455,7 +624,7 @@ void
 w_save (void) {
     char buf[20000] = "";
     save_widget_to_string (buf, sizeof (buf), rootwidget->children);
-    deadbeef->conf_set_str ("gtkui.layout", buf);
+    deadbeef->conf_set_str (DDB_GTKUI_CONF_LAYOUT, buf);
     deadbeef->conf_save ();
 }
 
@@ -562,12 +731,15 @@ show_widget (GtkWidget *widget, gpointer data) {
     gtk_widget_show (widget);
 }
 
+static GtkRequisition prev_req;
+
 void
 w_menu_deactivate (GtkMenuShell *menushell, gpointer user_data) {
     hidden = 0;
     ddb_gtkui_widget_t *w = user_data;
     if (GTK_IS_CONTAINER (w->widget)) {
         gtk_container_foreach (GTK_CONTAINER (w->widget), show_widget, NULL);
+        gtk_widget_set_size_request (w->widget, prev_req.width, prev_req.height);
     }
     gtk_widget_set_app_paintable (w->widget, FALSE);
     gtk_widget_queue_draw (w->widget);
@@ -582,9 +754,12 @@ w_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_da
     current_widget = user_data;
     widget = current_widget->widget;
     hidden = 1;
+
     if (GTK_IS_CONTAINER (widget)) {
         // hide all children
+        gtk_widget_size_request (widget, &prev_req);
         gtk_container_foreach (GTK_CONTAINER (widget), hide_widget, NULL);
+        gtk_widget_set_size_request (widget, prev_req.width, prev_req.height);
     }
 
     gtk_widget_set_app_paintable (widget, TRUE);
@@ -857,7 +1032,7 @@ w_placeholder_create (void) {
 
     w->base.widget = gtk_event_box_new ();
     w->drawarea  = gtk_drawing_area_new ();
-    gtk_widget_set_size_request (w->drawarea, 20, 20);
+    gtk_widget_set_size_request (w->base.widget, 20, 20);
     gtk_widget_show (w->drawarea);
     gtk_container_add (GTK_CONTAINER (w->base.widget), w->drawarea);
 
@@ -1603,26 +1778,25 @@ refresh_cb (gpointer data) {
 static gboolean
 playlistswitch_cb (gpointer p) {
     w_playlist_t *tp = (w_playlist_t *)p;
-    int curr = deadbeef->plt_get_curr_idx ();
-    char conf[100];
-    snprintf (conf, sizeof (conf), "playlist.scroll.%d", curr);
-    int scroll = deadbeef->conf_get_int (conf, 0);
-    snprintf (conf, sizeof (conf), "playlist.cursor.%d", curr);
-    int cursor = deadbeef->conf_get_int (conf, -1);
-    deadbeef->pl_set_cursor (PL_MAIN, cursor);
     if (!strcmp (tp->base.type, "tabbed_playlist")) {
         ddb_tabstrip_refresh (((w_tabbed_playlist_t *)tp)->tabstrip);
     }
-    if (cursor != -1) {
-        DB_playItem_t *it = deadbeef->pl_get_for_idx_and_iter (cursor, PL_MAIN);
-        if (it) {
-            deadbeef->pl_set_selected (it, 1);
-            deadbeef->pl_item_unref (it);
+    ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+    if (plt) {
+        int cursor = deadbeef->plt_get_cursor (plt, PL_MAIN);
+        int scroll = deadbeef->plt_get_scroll (plt);
+        if (cursor != -1) {
+            DB_playItem_t *it = deadbeef->pl_get_for_idx_and_iter (cursor, PL_MAIN);
+            if (it) {
+                deadbeef->pl_set_selected (it, 1);
+                deadbeef->pl_item_unref (it);
+            }
         }
-    }
+        deadbeef->plt_unref (plt);
 
-    ddb_listview_refresh (tp->list, DDB_LIST_CHANGED | DDB_REFRESH_LIST | DDB_REFRESH_VSCROLL);
-    ddb_listview_set_vscroll (tp->list, scroll);
+        ddb_listview_refresh (tp->list, DDB_LIST_CHANGED | DDB_REFRESH_LIST | DDB_REFRESH_VSCROLL);
+        ddb_listview_set_vscroll (tp->list, scroll);
+    }
     return FALSE;
 }
 
@@ -1649,9 +1823,6 @@ songchanged_cb (gpointer p) {
                 if (p) {
                     to_idx = deadbeef->plt_get_item_idx (p, to, PL_MAIN);
                     if (cursor_follows_playback) {
-                        char conf[100];
-                        snprintf (conf, sizeof (conf), "playlist.cursor.%d", plt);
-                        deadbeef->conf_set_int (conf, to_idx);
                         deadbeef->plt_deselect_all (p);
                         deadbeef->pl_set_selected (to, 1);
                         deadbeef->plt_set_cursor (p, PL_MAIN, to_idx);
@@ -1849,6 +2020,7 @@ w_playlist_init (ddb_gtkui_widget_t *base) {
     ddb_listview_show_header (w->list, !w->hideheaders);
 
     g_idle_add (playlistswitch_cb, w);
+    g_idle_add (refresh_cb, w->list);
 }
 
 static void
@@ -1887,11 +2059,11 @@ w_tabbed_playlist_create (void) {
     w->tabstrip = DDB_TABSTRIP (tabstrip);
     gtk_widget_show (tabstrip);
     GtkWidget *list = ddb_listview_new ();
+    gtk_widget_set_size_request (vbox, 100, 100);
     w->plt.list = (DdbListview *)list;
     gtk_widget_show (list);
 
     gtk_box_pack_start (GTK_BOX (vbox), tabstrip, FALSE, TRUE, 0);
-    gtk_widget_set_size_request (tabstrip, -1, 24);
     gtk_widget_set_can_focus (tabstrip, FALSE);
     gtk_widget_set_can_default (tabstrip, FALSE);
 
@@ -1899,7 +2071,6 @@ w_tabbed_playlist_create (void) {
 
     main_playlist_init (list);
 
-//    gtk_container_forall (GTK_CONTAINER (w->base.widget), w_override_signals, w);
     w_override_signals (w->plt.base.widget, w);
 
     w->plt.base.message = w_tabbed_playlist_message;
@@ -1915,6 +2086,7 @@ w_playlist_create (void) {
 
     w->base.widget = gtk_event_box_new ();
     w->list = DDB_LISTVIEW (ddb_listview_new ());
+    gtk_widget_set_size_request (GTK_WIDGET (w->base.widget), 100, 100);
     w->base.save = w_playlist_save;
     w->base.load = w_playlist_load;
     w->base.init = w_playlist_init;
@@ -2177,6 +2349,9 @@ static int
 coverart_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
     w_coverart_t *ca = (w_coverart_t *)w;
     switch (id) {
+    case DB_EV_PLAYLIST_REFRESH:
+        g_idle_add (coverart_redraw_cb, w);
+        break;
     case DB_EV_SONGSTARTED:
         g_idle_add (coverart_redraw_cb, w);
         break;
@@ -2923,8 +3098,6 @@ w_hvbox_replace (struct ddb_gtkui_widget_s *container, struct ddb_gtkui_widget_s
         return;
     }
 
-    w_remove (container, c);
-    w_destroy (c);
     if (prev) {
         prev->next = newchild;
     }
@@ -2933,6 +3106,8 @@ w_hvbox_replace (struct ddb_gtkui_widget_s *container, struct ddb_gtkui_widget_s
     }
     newchild->next = c->next;
     newchild->parent = container;
+    w_remove (container, c);
+    w_destroy (c);
 
     gtk_box_pack_start (GTK_BOX (b->box), newchild->widget, TRUE, TRUE, 0);
     gtk_widget_show (newchild->widget);
@@ -3448,3 +3623,263 @@ w_button_create (void) {
     w_override_signals (w->base.widget, w);
     return (ddb_gtkui_widget_t *)w;
 }
+
+// seekbar
+static gboolean
+redraw_seekbar_cb (gpointer data) {
+    w_seekbar_t *w = data;
+    int iconified = gdk_window_get_state(gtk_widget_get_window(mainwin)) & GDK_WINDOW_STATE_ICONIFIED;
+    if (!gtk_widget_get_visible (mainwin) || iconified) {
+        return FALSE;
+    }
+    gtk_widget_queue_draw (w->seekbar);
+    return FALSE;
+}
+
+static gboolean
+seekbar_frameupdate (gpointer data) {
+    w_seekbar_t *w = data;
+    DB_output_t *output = deadbeef->get_output ();
+    DB_playItem_t *track = deadbeef->streamer_get_playing_track ();
+    DB_fileinfo_t *c = deadbeef->streamer_get_current_fileinfo (); // FIXME: might crash streamer
+    float songpos = w->last_songpos;
+    float duration = track ? deadbeef->pl_get_item_duration (track) : -1;
+    if (!output || (output->state () == OUTPUT_STATE_STOPPED || !track || !c)) {
+        songpos = 0;
+    }
+    else {
+        songpos = deadbeef->streamer_get_playpos ();
+    }
+    // translate pos to seekbar pixels
+    songpos /= duration;
+    GtkAllocation a;
+    gtk_widget_get_allocation (w->seekbar, &a);
+    songpos *= a.width;
+    if (fabs (songpos - w->last_songpos) > 0.01) {
+        gtk_widget_queue_draw (w->seekbar);
+        w->last_songpos = songpos;
+    }
+    if (track) {
+        deadbeef->pl_item_unref (track);
+    }
+    return TRUE;
+}
+
+static void
+w_seekbar_init (ddb_gtkui_widget_t *base) {
+    w_seekbar_t *w = (w_seekbar_t *)base;
+    if (w->timer) {
+        g_source_remove (w->timer);
+        w->timer = 0;
+    }
+
+    w->timer = g_timeout_add (1000/gtkui_get_gui_refresh_rate (), seekbar_frameupdate, w);
+}
+
+static int
+w_seekbar_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+    switch (id) {
+    case DB_EV_SONGCHANGED:
+        g_idle_add (redraw_seekbar_cb, w);
+        break;
+    case DB_EV_CONFIGCHANGED:
+        w_seekbar_init (w);
+        break;
+    }
+    return 0;
+}
+
+static void
+w_seekbar_destroy (ddb_gtkui_widget_t *wbase) {
+    w_seekbar_t *w = (w_seekbar_t *)wbase;
+    if (w->timer) {
+        g_source_remove (w->timer);
+        w->timer = 0;
+    }
+}
+
+ddb_gtkui_widget_t *
+w_seekbar_create (void) {
+    w_seekbar_t *w = malloc (sizeof (w_seekbar_t));
+    memset (w, 0, sizeof (w_seekbar_t));
+    w->base.widget = gtk_event_box_new ();
+    w->base.message = w_seekbar_message;
+    w->base.destroy = w_seekbar_destroy;
+    w->base.init = w_seekbar_init;
+    w->seekbar = ddb_seekbar_new ();
+    gtk_widget_set_size_request (w->base.widget, 20, 16);
+    w->last_songpos = -1;
+    ddb_seekbar_init_signals (DDB_SEEKBAR (w->seekbar), w->base.widget);
+    gtk_widget_show (w->seekbar);
+    gtk_container_add (GTK_CONTAINER (w->base.widget), w->seekbar);
+    w_override_signals (w->base.widget, w);
+    return (ddb_gtkui_widget_t*)w;
+}
+
+// play toolbar
+ddb_gtkui_widget_t *
+w_playtb_create (void) {
+    w_playtb_t *w = malloc (sizeof (w_playtb_t));
+    memset (w, 0, sizeof (w_playtb_t));
+    w->base.widget = gtk_hbox_new (FALSE, 0);
+    w->base.flags = DDB_GTKUI_WIDGET_FLAG_NON_EXPANDABLE;
+    gtk_widget_show (w->base.widget);
+
+    GtkWidget *stopbtn;
+    GtkWidget *image128;
+    GtkWidget *playbtn;
+    GtkWidget *image2;
+    GtkWidget *pausebtn;
+    GtkWidget *image3;
+    GtkWidget *prevbtn;
+    GtkWidget *image4;
+    GtkWidget *nextbtn;
+    GtkWidget *image5;
+
+
+    stopbtn = gtk_button_new ();
+    gtk_widget_show (stopbtn);
+    gtk_box_pack_start (GTK_BOX (w->base.widget), stopbtn, FALSE, FALSE, 0);
+    gtk_widget_set_can_focus(stopbtn, FALSE);
+    gtk_button_set_relief (GTK_BUTTON (stopbtn), GTK_RELIEF_NONE);
+
+    image128 = gtk_image_new_from_stock ("gtk-media-stop", GTK_ICON_SIZE_BUTTON);
+    gtk_widget_show (image128);
+    gtk_container_add (GTK_CONTAINER (stopbtn), image128);
+
+    playbtn = gtk_button_new ();
+    gtk_widget_show (playbtn);
+    gtk_box_pack_start (GTK_BOX (w->base.widget), playbtn, FALSE, FALSE, 0);
+    gtk_widget_set_can_focus(playbtn, FALSE);
+    gtk_button_set_relief (GTK_BUTTON (playbtn), GTK_RELIEF_NONE);
+
+    image2 = gtk_image_new_from_stock ("gtk-media-play", GTK_ICON_SIZE_BUTTON);
+    gtk_widget_show (image2);
+    gtk_container_add (GTK_CONTAINER (playbtn), image2);
+
+    pausebtn = gtk_button_new ();
+    gtk_widget_show (pausebtn);
+    gtk_box_pack_start (GTK_BOX (w->base.widget), pausebtn, FALSE, FALSE, 0);
+    gtk_widget_set_can_focus(pausebtn, FALSE);
+    gtk_button_set_relief (GTK_BUTTON (pausebtn), GTK_RELIEF_NONE);
+
+    image3 = gtk_image_new_from_stock ("gtk-media-pause", GTK_ICON_SIZE_BUTTON);
+    gtk_widget_show (image3);
+    gtk_container_add (GTK_CONTAINER (pausebtn), image3);
+
+    prevbtn = gtk_button_new ();
+    gtk_widget_show (prevbtn);
+    gtk_box_pack_start (GTK_BOX (w->base.widget), prevbtn, FALSE, FALSE, 0);
+    gtk_widget_set_can_focus(prevbtn, FALSE);
+    gtk_button_set_relief (GTK_BUTTON (prevbtn), GTK_RELIEF_NONE);
+
+    image4 = gtk_image_new_from_stock ("gtk-media-previous", GTK_ICON_SIZE_BUTTON);
+    gtk_widget_show (image4);
+    gtk_container_add (GTK_CONTAINER (prevbtn), image4);
+
+    nextbtn = gtk_button_new ();
+    gtk_widget_show (nextbtn);
+    gtk_box_pack_start (GTK_BOX (w->base.widget), nextbtn, FALSE, FALSE, 0);
+    gtk_widget_set_can_focus(nextbtn, FALSE);
+    gtk_button_set_relief (GTK_BUTTON (nextbtn), GTK_RELIEF_NONE);
+
+    image5 = gtk_image_new_from_stock ("gtk-media-next", GTK_ICON_SIZE_BUTTON);
+    gtk_widget_show (image5);
+    gtk_container_add (GTK_CONTAINER (nextbtn), image5);
+    w_override_signals (w->base.widget, w);
+
+    g_signal_connect ((gpointer) stopbtn, "clicked",
+            G_CALLBACK (on_stopbtn_clicked),
+            NULL);
+    g_signal_connect ((gpointer) playbtn, "clicked",
+            G_CALLBACK (on_playbtn_clicked),
+            NULL);
+    g_signal_connect ((gpointer) pausebtn, "clicked",
+            G_CALLBACK (on_pausebtn_clicked),
+            NULL);
+    g_signal_connect ((gpointer) prevbtn, "clicked",
+            G_CALLBACK (on_prevbtn_clicked),
+            NULL);
+    g_signal_connect ((gpointer) nextbtn, "clicked",
+            G_CALLBACK (on_nextbtn_clicked),
+            NULL);
+    return (ddb_gtkui_widget_t*)w;
+}
+
+// volumebar
+static gboolean
+redraw_volumebar_cb (gpointer data) {
+    w_volumebar_t *w = data;
+    gtk_widget_queue_draw (w->volumebar);
+    char s[100];
+    int db = deadbeef->volume_get_db ();
+    snprintf (s, sizeof (s), "%s%ddB", db < 0 ? "" : "+", db);
+    gtk_widget_set_tooltip_text (w->volumebar, s);
+    gtk_widget_trigger_tooltip_query (w->volumebar);
+    return FALSE;
+}
+
+static int
+w_volumebar_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+    switch (id) {
+    case DB_EV_CONFIGCHANGED:
+    case DB_EV_VOLUMECHANGED:
+        g_idle_add (redraw_volumebar_cb, w);
+        break;
+    }
+    return 0;
+}
+
+ddb_gtkui_widget_t *
+w_volumebar_create (void) {
+    w_volumebar_t *w = malloc (sizeof (w_volumebar_t));
+    memset (w, 0, sizeof (w_volumebar_t));
+    w->base.widget = gtk_event_box_new ();
+    w->base.message = w_volumebar_message;
+    w->volumebar = ddb_volumebar_new ();
+    ddb_volumebar_init_signals (DDB_VOLUMEBAR (w->volumebar), w->base.widget);
+    gtk_widget_show (w->volumebar);
+    gtk_widget_set_size_request (w->base.widget, 70, -1);
+    gtk_container_add (GTK_CONTAINER (w->base.widget), w->volumebar);
+    w_override_signals (w->base.widget, w);
+    return (ddb_gtkui_widget_t*)w;
+}
+
+// chiptune voice ctl
+static void
+on_voice_toggled (GtkToggleButton *togglebutton, gpointer user_data) {
+    w_ctvoices_t *w = user_data;
+    int voices = 0;
+    for (int i = 0; i < 8; i++) {
+        int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w->voices[i]));
+        voices |= active << i;
+    }
+    deadbeef->conf_set_int ("chip.voices", voices);
+    deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+ddb_gtkui_widget_t *
+w_ctvoices_create (void) {
+    w_ctvoices_t *w = malloc (sizeof (w_ctvoices_t));
+    memset (w, 0, sizeof (w_ctvoices_t));
+    w->base.widget = gtk_event_box_new ();
+    GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
+    gtk_widget_show (hbox);
+    gtk_container_add (GTK_CONTAINER (w->base.widget), hbox);
+
+    GtkWidget *label = gtk_label_new_with_mnemonic (_("Voices:"));
+    gtk_widget_show (label);
+    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+    int voices = deadbeef->conf_get_int ("chip.voices", 0xff);
+    for (int i = 0; i < 8; i++) {
+        w->voices[i] = gtk_check_button_new ();
+        gtk_widget_show (w->voices[i]);
+        gtk_box_pack_start (GTK_BOX (hbox), w->voices[i], FALSE, FALSE, 0);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w->voices[i]), voices & (1<<i));
+        g_signal_connect ((gpointer) w->voices[i], "toggled", G_CALLBACK (on_voice_toggled), w);
+    }
+
+    w_override_signals (w->base.widget, w);
+    return (ddb_gtkui_widget_t*)w;
+}
diff --git a/plugins/gtkui/widgets.h b/plugins/gtkui/widgets.h
index 964fb66..14d26b9 100644
--- a/plugins/gtkui/widgets.h
+++ b/plugins/gtkui/widgets.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2011 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
@@ -122,4 +122,16 @@ w_vbox_create (void);
 ddb_gtkui_widget_t *
 w_button_create (void);
 
+ddb_gtkui_widget_t *
+w_seekbar_create (void);
+
+ddb_gtkui_widget_t *
+w_playtb_create (void);
+
+ddb_gtkui_widget_t *
+w_volumebar_create (void);
+
+ddb_gtkui_widget_t *
+w_ctvoices_create (void);
+
 #endif
diff --git a/plugins/gtkui/wingeom.c b/plugins/gtkui/wingeom.c
index 60290ff..f2b538c 100644
--- a/plugins/gtkui/wingeom.c
+++ b/plugins/gtkui/wingeom.c
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/gtkui/wingeom.h b/plugins/gtkui/wingeom.h
index 6ed43a0..c79517f 100644
--- a/plugins/gtkui/wingeom.h
+++ b/plugins/gtkui/wingeom.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/hotkeys/COPYING b/plugins/hotkeys/COPYING
new file mode 100644
index 0000000..197bfba
--- /dev/null
+++ b/plugins/hotkeys/COPYING
@@ -0,0 +1,22 @@
+Hotkeys plugin for DeaDBeeF
+
+Copyright (C) 2009-2011 Viktor Semykin <thesame.ml at gmail.com>
+Copyright (C) 2012-2014 Alexey Yakovenko <waker at users.sourceforge.net>
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
diff --git a/plugins/hotkeys/Makefile.am b/plugins/hotkeys/Makefile.am
index b962491..2fd1ad3 100644
--- a/plugins/hotkeys/Makefile.am
+++ b/plugins/hotkeys/Makefile.am
@@ -2,10 +2,10 @@ if HAVE_HOTKEYS
 hotkeysdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = hotkeys.la
 hotkeys_la_SOURCES = hotkeys.c hotkeys.h ../libparser/parser.c ../libparser/parser.h actionhandlers.c actionhandlers.h
-hotkeys_la_LDFLAGS = -module
+hotkeys_la_LDFLAGS = -module -avoid-version
 
 EXTRA_hotkeys_la_SOURCES = keysyms.inc
 
 hotkeys_la_LIBADD = $(LDADD) $(HOTKEYS_LIBS)
-AM_CFLAGS = $(CFLAGS) -std=c99
+AM_CFLAGS = $(CFLAGS) $(HOTKEYS_CFLAGS) -std=c99
 endif
diff --git a/plugins/hotkeys/Makefile.in b/plugins/hotkeys/Makefile.in
index 7a75c66..5f6d741 100644
--- a/plugins/hotkeys/Makefile.in
+++ b/plugins/hotkeys/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/hotkeys
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -118,23 +146,48 @@ am__hotkeys_la_SOURCES_DIST = hotkeys.c hotkeys.h \
 @HAVE_HOTKEYS_TRUE@	actionhandlers.lo
 am__EXTRA_hotkeys_la_SOURCES_DIST = keysyms.inc
 hotkeys_la_OBJECTS = $(am_hotkeys_la_OBJECTS)
-hotkeys_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+hotkeys_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(hotkeys_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_HOTKEYS_TRUE at am_hotkeys_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(hotkeys_la_SOURCES) $(EXTRA_hotkeys_la_SOURCES)
 DIST_SOURCES = $(am__hotkeys_la_SOURCES_DIST) \
 	$(am__EXTRA_hotkeys_la_SOURCES_DIST)
@@ -143,6 +196,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -169,6 +239,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -189,10 +260,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -215,6 +288,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -268,6 +342,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -286,6 +361,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -311,13 +388,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -326,7 +407,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -387,10 +470,10 @@ top_srcdir = @top_srcdir@
 @HAVE_HOTKEYS_TRUE at hotkeysdir = $(libdir)/$(PACKAGE)
 @HAVE_HOTKEYS_TRUE at pkglib_LTLIBRARIES = hotkeys.la
 @HAVE_HOTKEYS_TRUE at hotkeys_la_SOURCES = hotkeys.c hotkeys.h ../libparser/parser.c ../libparser/parser.h actionhandlers.c actionhandlers.h
- at HAVE_HOTKEYS_TRUE@hotkeys_la_LDFLAGS = -module
+ at HAVE_HOTKEYS_TRUE@hotkeys_la_LDFLAGS = -module -avoid-version
 @HAVE_HOTKEYS_TRUE at EXTRA_hotkeys_la_SOURCES = keysyms.inc
 @HAVE_HOTKEYS_TRUE at hotkeys_la_LIBADD = $(LDADD) $(HOTKEYS_LIBS)
- at HAVE_HOTKEYS_TRUE@AM_CFLAGS = $(CFLAGS) -std=c99
+ at HAVE_HOTKEYS_TRUE@AM_CFLAGS = $(CFLAGS) $(HOTKEYS_CFLAGS) -std=c99
 all: all-am
 
 .SUFFIXES:
@@ -425,6 +508,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -451,14 +535,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 hotkeys.la: $(hotkeys_la_OBJECTS) $(hotkeys_la_DEPENDENCIES) $(EXTRA_hotkeys_la_DEPENDENCIES) 
-	$(hotkeys_la_LINK) $(am_hotkeys_la_rpath) $(hotkeys_la_OBJECTS) $(hotkeys_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(hotkeys_la_LINK) $(am_hotkeys_la_rpath) $(hotkeys_la_OBJECTS) $(hotkeys_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -471,32 +558,32 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/parser.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 parser.lo: ../libparser/parser.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT parser.lo -MD -MP -MF $(DEPDIR)/parser.Tpo -c -o parser.lo `test -f '../libparser/parser.c' || echo '$(srcdir)/'`../libparser/parser.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/parser.Tpo $(DEPDIR)/parser.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libparser/parser.c' object='parser.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT parser.lo -MD -MP -MF $(DEPDIR)/parser.Tpo -c -o parser.lo `test -f '../libparser/parser.c' || echo '$(srcdir)/'`../libparser/parser.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/parser.Tpo $(DEPDIR)/parser.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../libparser/parser.c' object='parser.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o parser.lo `test -f '../libparser/parser.c' || echo '$(srcdir)/'`../libparser/parser.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o parser.lo `test -f '../libparser/parser.c' || echo '$(srcdir)/'`../libparser/parser.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -504,26 +591,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -535,15 +611,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -552,6 +624,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -696,19 +783,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/hotkeys/hotkeys.c b/plugins/hotkeys/hotkeys.c
index b7179ca..ed335d6 100644
--- a/plugins/hotkeys/hotkeys.c
+++ b/plugins/hotkeys/hotkeys.c
@@ -3,18 +3,23 @@
     Copyright (C) 2009-2011 Viktor Semykin <thesame.ml at gmail.com>
     Copyright (C) 2012-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -410,7 +415,10 @@ static void
 cleanup () {
     command_count = 0;
 #ifndef __APPLE__
-    XCloseDisplay (disp);
+    if (disp) {
+        XCloseDisplay (disp);
+        disp = NULL;
+    }
 #endif
 }
 
@@ -452,7 +460,7 @@ hotkeys_event_loop (void *unused) {
                     if (f & 8) {
                         flags |= Mod5Mask;
                     }
-                    XUngrabKey (disp, commands[i].keycode, commands[i].modifier | flags, DefaultRootWindow (disp));
+                    XUngrabKey (disp, commands[i].x11_keycode, commands[i].modifier | flags, DefaultRootWindow (disp));
                 }
             }
             memset (commands, 0, sizeof (commands));
@@ -579,6 +587,7 @@ hotkeys_reset (void) {
 
 int
 action_play_cb (struct DB_plugin_action_s *action, int ctx) {
+    // NOTE: this function is copied as on_playbtn_clicked in gtkui
     DB_output_t *output = deadbeef->get_output ();
     if (output->state () == OUTPUT_STATE_PAUSED) {
         ddb_playlist_t *plt = deadbeef->plt_get_curr ();
@@ -605,7 +614,16 @@ action_play_cb (struct DB_plugin_action_s *action, int ctx) {
         deadbeef->plt_unref (plt);
     }
     else {
-        deadbeef->sendmessage (DB_EV_PLAY_CURRENT, 0, 0, 0);
+        ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+        int cur = -1;
+        if (plt) {
+            cur = deadbeef->plt_get_cursor (plt, PL_MAIN);
+            deadbeef->plt_unref (plt);
+        }
+        if (cur == -1) {
+            cur = 0;
+        }
+        deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, cur, 0);
     }
     return 0;
 }
@@ -676,7 +694,12 @@ action_seek_5p_backward_cb (struct DB_plugin_action_s *action, int ctx) {
         float dur = deadbeef->pl_get_item_duration (it);
         if (dur > 0) {
             float pos = deadbeef->streamer_get_playpos ();
-            deadbeef->sendmessage (DB_EV_SEEK, 0, (pos - dur * 0.05f) * 1000, 0);
+            pos = (pos - dur * 0.05f) * 1000;
+            if (pos < 0) {
+                pos = 0;
+            }
+
+            deadbeef->sendmessage (DB_EV_SEEK, 0, pos, 0);
         }
         deadbeef->pl_item_unref (it);
     }
@@ -708,7 +731,11 @@ action_seek_1p_backward_cb (struct DB_plugin_action_s *action, int ctx) {
         float dur = deadbeef->pl_get_item_duration (it);
         if (dur > 0) {
             float pos = deadbeef->streamer_get_playpos ();
-            deadbeef->sendmessage (DB_EV_SEEK, 0, (pos - dur * 0.01f) * 1000, 0);
+            pos = (pos - dur * 0.01f) * 1000;
+            if (pos < 0) {
+                pos = 0;
+            }
+            deadbeef->sendmessage (DB_EV_SEEK, 0, pos, 0);
         }
         deadbeef->pl_item_unref (it);
     }
@@ -737,8 +764,17 @@ action_toggle_stop_after_current_cb (struct DB_plugin_action_s *action, int ctx)
     return 0;
 }
 
+int
+action_toggle_stop_after_album_cb (struct DB_plugin_action_s *action, int ctx) {
+    int var = deadbeef->conf_get_int ("playlist.stop_after_album", 0);
+    var = 1 - var;
+    deadbeef->conf_set_int ("playlist.stop_after_album", var);
+    deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+    return 0;
+}
+
 static DB_plugin_action_t action_reload_metadata = {
-    .title = "Reload metadata",
+    .title = "Reload Metadata",
     .name = "reload_metadata",
     .flags = DB_ACTION_MULTIPLE_TRACKS,
     .callback2 = action_reload_metadata_handler,
@@ -746,7 +782,7 @@ static DB_plugin_action_t action_reload_metadata = {
 };
 
 static DB_plugin_action_t action_jump_to_current = {
-    .title = "Playback/Jump to currently playing track",
+    .title = "Playback/Jump To Currently Playing Track",
     .name = "jump_to_current_track",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_jump_to_current_handler,
@@ -754,7 +790,7 @@ static DB_plugin_action_t action_jump_to_current = {
 };
 
 static DB_plugin_action_t action_next_playlist = {
-    .title = "Next playlist",
+    .title = "Next Playlist",
     .name = "next_playlist",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_next_playlist_handler,
@@ -762,7 +798,7 @@ static DB_plugin_action_t action_next_playlist = {
 };
 
 static DB_plugin_action_t action_prev_playlist = {
-    .title = "Prev playlist",
+    .title = "Prev Playlist",
     .name = "prev_playlist",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_prev_playlist_handler,
@@ -770,7 +806,7 @@ static DB_plugin_action_t action_prev_playlist = {
 };
 
 static DB_plugin_action_t action_playlist10 = {
-    .title = "Switch to playlist 10",
+    .title = "Switch To Playlist 10",
     .name = "playlist10",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playlist10_handler,
@@ -778,7 +814,7 @@ static DB_plugin_action_t action_playlist10 = {
 };
 
 static DB_plugin_action_t action_playlist9 = {
-    .title = "Switch to playlist 9",
+    .title = "Switch To Playlist 9",
     .name = "playlist9",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playlist9_handler,
@@ -786,7 +822,7 @@ static DB_plugin_action_t action_playlist9 = {
 };
 
 static DB_plugin_action_t action_playlist8 = {
-    .title = "Switch to playlist 8",
+    .title = "Switch To Playlist 8",
     .name = "playlist8",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playlist8_handler,
@@ -794,7 +830,7 @@ static DB_plugin_action_t action_playlist8 = {
 };
 
 static DB_plugin_action_t action_playlist7 = {
-    .title = "Switch to playlist 7",
+    .title = "Switch To Playlist 7",
     .name = "playlist7",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playlist7_handler,
@@ -802,7 +838,7 @@ static DB_plugin_action_t action_playlist7 = {
 };
 
 static DB_plugin_action_t action_playlist6 = {
-    .title = "Switch to playlist 6",
+    .title = "Switch To Playlist 6",
     .name = "playlist6",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playlist6_handler,
@@ -810,7 +846,7 @@ static DB_plugin_action_t action_playlist6 = {
 };
 
 static DB_plugin_action_t action_playlist5 = {
-    .title = "Switch to playlist 5",
+    .title = "Switch To Playlist 5",
     .name = "playlist5",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playlist5_handler,
@@ -818,7 +854,7 @@ static DB_plugin_action_t action_playlist5 = {
 };
 
 static DB_plugin_action_t action_playlist4 = {
-    .title = "Switch to playlist 4",
+    .title = "Switch To Playlist 4",
     .name = "playlist4",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playlist4_handler,
@@ -826,7 +862,7 @@ static DB_plugin_action_t action_playlist4 = {
 };
 
 static DB_plugin_action_t action_playlist3 = {
-    .title = "Switch to playlist 3",
+    .title = "Switch To Playlist 3",
     .name = "playlist3",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playlist3_handler,
@@ -834,7 +870,7 @@ static DB_plugin_action_t action_playlist3 = {
 };
 
 static DB_plugin_action_t action_playlist2 = {
-    .title = "Switch to playlist 2",
+    .title = "Switch To Playlist 2",
     .name = "playlist2",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playlist2_handler,
@@ -842,7 +878,7 @@ static DB_plugin_action_t action_playlist2 = {
 };
 
 static DB_plugin_action_t action_playlist1 = {
-    .title = "Switch to playlist 1",
+    .title = "Switch To Playlist 1",
     .name = "playlist1",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_playlist1_handler,
@@ -858,7 +894,7 @@ static DB_plugin_action_t action_sort_randomize = {
 };
 
 static DB_plugin_action_t action_sort_by_date = {
-    .title = "Edit/Sort by date",
+    .title = "Edit/Sort By Date",
     .name = "sort_date",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_sort_by_date_handler,
@@ -866,7 +902,7 @@ static DB_plugin_action_t action_sort_by_date = {
 };
 
 static DB_plugin_action_t action_sort_by_artist = {
-    .title = "Edit/Sort by artist",
+    .title = "Edit/Sort By Artist",
     .name = "sort_artist",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_sort_by_artist_handler,
@@ -875,7 +911,7 @@ static DB_plugin_action_t action_sort_by_artist = {
 
 
 static DB_plugin_action_t action_sort_by_album = {
-    .title = "Edit/Sort by album",
+    .title = "Edit/Sort By Album",
     .name = "sort_album",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_sort_by_album_handler,
@@ -883,7 +919,7 @@ static DB_plugin_action_t action_sort_by_album = {
 };
 
 static DB_plugin_action_t action_sort_by_tracknr = {
-    .title = "Edit/Sort by track number",
+    .title = "Edit/Sort By Track Number",
     .name = "sort_tracknr",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_sort_by_tracknr_handler,
@@ -891,7 +927,7 @@ static DB_plugin_action_t action_sort_by_tracknr = {
 };
 
 static DB_plugin_action_t action_sort_by_title = {
-    .title = "Edit/Sort by title",
+    .title = "Edit/Sort By Title",
     .name = "sort_title",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_sort_by_title_handler,
@@ -907,7 +943,7 @@ static DB_plugin_action_t action_invert_selection = {
 };
 
 static DB_plugin_action_t action_clear_playlist = {
-    .title = "Edit/Clear playlist",
+    .title = "Edit/Clear Playlist",
     .name = "clear_playlist",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_clear_playlist_handler,
@@ -915,7 +951,7 @@ static DB_plugin_action_t action_clear_playlist = {
 };
 
 static DB_plugin_action_t action_remove_from_playqueue = {
-    .title = "Playback/Remove from playback queue",
+    .title = "Playback/Remove From Playback Queue",
     .name = "remove_from_playback_queue",
     .flags = DB_ACTION_MULTIPLE_TRACKS,
     .callback2 = action_remove_from_playqueue_handler,
@@ -923,7 +959,7 @@ static DB_plugin_action_t action_remove_from_playqueue = {
 };
 
 static DB_plugin_action_t action_add_to_playqueue = {
-    .title = "Playback/Add to playback queue",
+    .title = "Playback/Add To Playback Queue",
     .name = "add_to_playback_queue",
     .flags = DB_ACTION_MULTIPLE_TRACKS,
     .callback2 = action_add_to_playqueue_handler,
@@ -995,7 +1031,7 @@ static DB_plugin_action_t action_play_random = {
 };
 
 static DB_plugin_action_t action_seek_1p_forward = {
-    .title = "Playback/Seek 1% forward",
+    .title = "Playback/Seek 1% Forward",
     .name = "seek_1p_fwd",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_seek_1p_forward_cb,
@@ -1003,7 +1039,7 @@ static DB_plugin_action_t action_seek_1p_forward = {
 };
 
 static DB_plugin_action_t action_seek_1p_backward = {
-    .title = "Playback/Seek 1% backward",
+    .title = "Playback/Seek 1% Backward",
     .name = "seek_1p_back",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_seek_1p_backward_cb,
@@ -1011,7 +1047,7 @@ static DB_plugin_action_t action_seek_1p_backward = {
 };
 
 static DB_plugin_action_t action_seek_5p_forward = {
-    .title = "Playback/Seek 5% forward",
+    .title = "Playback/Seek 5% Forward",
     .name = "seek_5p_fwd",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_seek_5p_forward_cb,
@@ -1019,7 +1055,7 @@ static DB_plugin_action_t action_seek_5p_forward = {
 };
 
 static DB_plugin_action_t action_seek_5p_backward = {
-    .title = "Playback/Seek 5% backward",
+    .title = "Playback/Seek 5% Backward",
     .name = "seek_5p_back",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_seek_5p_backward_cb,
@@ -1043,17 +1079,25 @@ static DB_plugin_action_t action_volume_down = {
 };
 
 static DB_plugin_action_t action_toggle_stop_after_current = {
-    .title = "Playback/Toggle Stop After Current",
+    .title = "Playback/Toggle Stop After Current Track",
     .name = "toggle_stop_after_current",
     .flags = DB_ACTION_COMMON,
     .callback2 = action_toggle_stop_after_current_cb,
     .next = &action_volume_down
 };
 
+static DB_plugin_action_t action_toggle_stop_after_album = {
+    .title = "Playback/Toggle Stop After Current Album",
+    .name = "toggle_stop_after_album",
+    .flags = DB_ACTION_COMMON,
+    .callback2 = action_toggle_stop_after_album_cb,
+    .next = &action_toggle_stop_after_current
+};
+
 static DB_plugin_action_t *
 hotkeys_get_actions (DB_playItem_t *it)
 {
-    return &action_toggle_stop_after_current;
+    return &action_toggle_stop_after_album;
 }
 
 // define plugin interface
diff --git a/plugins/hotkeys/hotkeys.h b/plugins/hotkeys/hotkeys.h
index cfc1210..7c7171f 100644
--- a/plugins/hotkeys/hotkeys.h
+++ b/plugins/hotkeys/hotkeys.h
@@ -1,21 +1,25 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2011 Alexey Yakovenko <waker at users.sourceforge.net>
+    Hotkeys plugin for DeaDBeeF
+    Copyright (C) 2009-2011 Viktor Semykin <thesame.ml at gmail.com>
     Copyright (C) 2012-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
 #ifndef __HOTKEYS_H
 #define __HOTKEYS_H
diff --git a/plugins/lastfm/COPYING b/plugins/lastfm/COPYING
new file mode 100644
index 0000000..5903dc6
--- /dev/null
+++ b/plugins/lastfm/COPYING
@@ -0,0 +1,17 @@
+Last.fm scrobbler plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko 
+
+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.
+
diff --git a/plugins/lastfm/Makefile.am b/plugins/lastfm/Makefile.am
index 87499d7..946edec 100644
--- a/plugins/lastfm/Makefile.am
+++ b/plugins/lastfm/Makefile.am
@@ -2,8 +2,8 @@ if HAVE_LASTFM
 lastfmdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = lastfm.la
 lastfm_la_SOURCES = lastfm.c
-lastfm_la_LDFLAGS = -module
+lastfm_la_LDFLAGS = -module -avoid-version
 
 lastfm_la_LIBADD = $(LDADD) $(CURL_LIBS)
-AM_CFLAGS = -std=c99
+AM_CFLAGS = -std=c99 $(CURL_CFLAGS)
 endif
diff --git a/plugins/lastfm/Makefile.in b/plugins/lastfm/Makefile.in
index 796f91e..61b6b6e 100644
--- a/plugins/lastfm/Makefile.in
+++ b/plugins/lastfm/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/lastfm
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -114,23 +142,48 @@ am__DEPENDENCIES_1 =
 am__lastfm_la_SOURCES_DIST = lastfm.c
 @HAVE_LASTFM_TRUE at am_lastfm_la_OBJECTS = lastfm.lo
 lastfm_la_OBJECTS = $(am_lastfm_la_OBJECTS)
-lastfm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+lastfm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(lastfm_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_LASTFM_TRUE at am_lastfm_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(lastfm_la_SOURCES)
 DIST_SOURCES = $(am__lastfm_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,6 +191,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,6 +234,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -184,10 +255,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -210,6 +283,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -263,6 +337,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -281,6 +356,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -306,13 +383,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -321,7 +402,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -382,9 +465,9 @@ top_srcdir = @top_srcdir@
 @HAVE_LASTFM_TRUE at lastfmdir = $(libdir)/$(PACKAGE)
 @HAVE_LASTFM_TRUE at pkglib_LTLIBRARIES = lastfm.la
 @HAVE_LASTFM_TRUE at lastfm_la_SOURCES = lastfm.c
- at HAVE_LASTFM_TRUE@lastfm_la_LDFLAGS = -module
+ at HAVE_LASTFM_TRUE@lastfm_la_LDFLAGS = -module -avoid-version
 @HAVE_LASTFM_TRUE at lastfm_la_LIBADD = $(LDADD) $(CURL_LIBS)
- at HAVE_LASTFM_TRUE@AM_CFLAGS = -std=c99
+ at HAVE_LASTFM_TRUE@AM_CFLAGS = -std=c99 $(CURL_CFLAGS)
 all: all-am
 
 .SUFFIXES:
@@ -419,6 +502,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -445,14 +529,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 lastfm.la: $(lastfm_la_OBJECTS) $(lastfm_la_DEPENDENCIES) $(EXTRA_lastfm_la_DEPENDENCIES) 
-	$(lastfm_la_LINK) $(am_lastfm_la_rpath) $(lastfm_la_OBJECTS) $(lastfm_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(lastfm_la_LINK) $(am_lastfm_la_rpath) $(lastfm_la_OBJECTS) $(lastfm_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -463,25 +550,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lastfm.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,26 +576,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +596,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +609,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -681,19 +768,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/lastfm/lastfm.c b/plugins/lastfm/lastfm.c
index d0d64e3..4d112ac 100644
--- a/plugins/lastfm/lastfm.c
+++ b/plugins/lastfm/lastfm.c
@@ -1,6 +1,6 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    Last.fm scrobbler plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko 
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <curl/curl.h>
+#include <math.h>
 #include "../../deadbeef.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
@@ -68,6 +69,7 @@ static char lfm_nowplaying[2048]; // packet for nowplaying, or ""
 typedef struct {
     DB_playItem_t *it;
     time_t started_timestamp;
+    float playtime;
 } subm_item_t;
 
 static subm_item_t lfm_subm_queue[LFM_SUBMISSION_QUEUE_SIZE];
@@ -278,7 +280,7 @@ auth (void) {
             end++;
         }
         if (end - p > sizeof (lfm_nowplaying_url)-1) {
-            trace ("scrobbler nowplaying url is too long:\n", lfm_reply);
+            trace ("scrobbler nowplaying url is too long %d:\n", (int)(end-p));
             goto fail;
         }
         strncpy (lfm_nowplaying_url, p, end-p);
@@ -299,7 +301,7 @@ auth (void) {
             end++;
         }
         if (end - p > sizeof (lfm_submission_url)-1) {
-            trace ("scrobbler submission url is too long:\n", lfm_reply);
+            trace ("scrobbler submission url is too long: %d\n", (int)(end-p));
             goto fail;
         }
         strncpy (lfm_submission_url, p, end-p);
@@ -322,7 +324,7 @@ fail:
 }
 
 static int
-lfm_fetch_song_info (DB_playItem_t *song, char *a, char *t, char *b, float *l, char *n, char *m) {
+lfm_fetch_song_info (DB_playItem_t *song, float playtime, char *a, char *t, char *b, float *l, char *n, char *m) {
     if (deadbeef->conf_get_int ("lastfm.prefer_album_artist", 0)) {
         if (!deadbeef->pl_get_meta (song, "band", a, META_FIELD_SIZE)) {
             if (!deadbeef->pl_get_meta (song, "album artist", a, META_FIELD_SIZE)) {
@@ -352,10 +354,16 @@ lfm_fetch_song_info (DB_playItem_t *song, char *a, char *t, char *b, float *l, c
         *b = 0;
     }
     *l = deadbeef->pl_get_item_duration (song);
+    if (*l <= 0) {
+        *l = playtime;
+    }
+    if (*l < 30 && deadbeef->conf_get_int ("lastfm.submit_tiny_tracks", 0)) {
+        *l = 30;
+    }
     if (!deadbeef->pl_get_meta (song, "track", n, META_FIELD_SIZE)) {
         *n = 0;
     }
-    if (!deadbeef->pl_get_meta (song, "mbid", m, META_FIELD_SIZE)) {
+    if (!deadbeef->conf_get_int ("lastfm.mbid", 0) || !deadbeef->pl_get_meta (song, "musicbrainz_trackid", m, META_FIELD_SIZE)) {
         *m = 0;
     }
     return 0;
@@ -433,7 +441,7 @@ lfm_add_keyvalue_uri_encoded (char **out, int *outl, const char *key, const char
 // subm is submission idx, or -1 for nowplaying
 // returns number of bytes added, or -1
 static int
-lfm_format_uri (int subm, DB_playItem_t *song, char *out, int outl, time_t started_timestamp) {
+lfm_format_uri (int subm, DB_playItem_t *song, char *out, int outl, time_t started_timestamp, float playtime) {
     if (subm > 50) {
         trace ("lastfm: it's only allowed to send up to 50 submissions at once (got idx=%d)\n", subm);
         return -1;
@@ -462,7 +470,7 @@ lfm_format_uri (int subm, DB_playItem_t *song, char *out, int outl, time_t start
         strcpy (km+1, ka+1);
     }
 
-    if (lfm_fetch_song_info (song, a, t, b, &l, n, m) == 0) {
+    if (lfm_fetch_song_info (song, playtime, a, t, b, &l, n, m) == 0) {
 //        trace ("playtime: %f\nartist: %s\ntitle: %s\nalbum: %s\nduration: %f\ntracknum: %s\n---\n", song->playtime, a, t, b, l, n);
     }
     else {
@@ -518,7 +526,7 @@ lastfm_songstarted (ddb_event_track_t *ev, uintptr_t data) {
         return 0;
     }
     deadbeef->mutex_lock (lfm_mutex);
-    if (lfm_format_uri (-1, ev->track, lfm_nowplaying, sizeof (lfm_nowplaying), ev->started_timestamp) < 0) {
+    if (lfm_format_uri (-1, ev->track, lfm_nowplaying, sizeof (lfm_nowplaying), ev->started_timestamp, 120) < 0) {
         lfm_nowplaying[0] = 0;
     }
 //    trace ("%s\n", lfm_nowplaying);
@@ -542,13 +550,18 @@ lastfm_songchanged (ddb_event_trackchange_t *ev, uintptr_t data) {
     trace ("lfm songfinished %s\n", deadbeef->pl_find_meta (ev->from, ":URI"));
 #if !LFM_IGNORE_RULES
     // check submission rules
-    // duration must be >= 30 sec
-    if (deadbeef->pl_get_item_duration (ev->from) < 30) {
-        trace ("track duration is %f seconds. not eligible for submission\n", deadbeef->pl_get_item_duration (ev->from));
-        return 0;
-    }
-    // must be played for >=240sec of half the total time
-    if (ev->playtime < 240 && ev->playtime < deadbeef->pl_get_item_duration (ev->from)/2) {
+    // duration/playtime must be >= 30 sec
+    float dur = deadbeef->pl_get_item_duration (ev->from);
+    if (dur < 30 && ev->playtime < 30) {
+        // the lastfm.send_tiny_tracks option can override this rule
+        // only if the track played fully, and has determined duration
+        if (!(dur > 0 && fabs (ev->playtime - dur) < 1.f && deadbeef->conf_get_int ("lastfm.submit_tiny_tracks", 0))) {
+            trace ("track duration is %f sec, playtime if %f sec. not eligible for submission\n", dur, ev->playtime);
+            return 0;
+        }
+    }
+    // must be played for >=240sec or half the total time
+    if (ev->playtime < 240 && ev->playtime < dur/2) {
         trace ("track playtime=%f seconds. not eligible for submission\n", ev->playtime);
         return 0;
     }
@@ -568,6 +581,7 @@ lastfm_songchanged (ddb_event_trackchange_t *ev, uintptr_t data) {
             trace ("lfm: song is now in queue for submission\n");
             lfm_subm_queue[i].it = ev->from;
             lfm_subm_queue[i].started_timestamp = ev->started_timestamp;
+            lfm_subm_queue[i].playtime = ev->playtime;
             deadbeef->pl_item_ref (ev->from);
             break;
         }
@@ -634,7 +648,7 @@ lfm_send_submissions (void) {
     deadbeef->mutex_lock (lfm_mutex);
     for (i = 0; i < LFM_SUBMISSION_QUEUE_SIZE; i++) {
         if (lfm_subm_queue[i].it) {
-            res = lfm_format_uri (idx, lfm_subm_queue[i].it, r, len, lfm_subm_queue[i].started_timestamp);
+            res = lfm_format_uri (idx, lfm_subm_queue[i].it, r, len, lfm_subm_queue[i].started_timestamp, lfm_subm_queue[i].playtime);
             if (res < 0) {
                 trace ("lfm: failed to format uri\n");
                 return;
@@ -934,27 +948,12 @@ out:
     return 0;
 }
 
-static int
-lfm_action_love (DB_plugin_action_t *act, int ctx)
-{
-    printf ("Love starts here\n");
-    return 0;
-}
-
-static DB_plugin_action_t love_action = {
-    .title = "Love at Last.fm",
-    .name = "lfm_love",
-    .flags = DB_ACTION_SINGLE_TRACK,
-    .callback2 = lfm_action_love,
-    .next = NULL
-};
-
 static DB_plugin_action_t lookup_action = {
-    .title = "Lookup on Last.fm",
+    .title = "Lookup On Last.fm",
     .name = "lfm_lookup",
     .flags = DB_ACTION_SINGLE_TRACK | DB_ACTION_ADD_MENU,
     .callback2 = lfm_action_lookup,
-    .next = NULL// &love_action
+    .next = NULL
 };
 
 static DB_plugin_action_t *
@@ -965,12 +964,10 @@ lfm_get_actions (DB_playItem_t *it)
         !deadbeef->pl_meta_exists (it, "artist") ||
         !deadbeef->pl_meta_exists (it, "title"))
     {
-        love_action.flags |= DB_ACTION_DISABLED;
         lookup_action.flags |= DB_ACTION_DISABLED;
     }
     else
     {
-        love_action.flags &= ~DB_ACTION_DISABLED;
         lookup_action.flags &= ~DB_ACTION_DISABLED;
     }
     deadbeef->pl_unlock ();
@@ -984,6 +981,8 @@ static const char settings_dlg[] =
     "property Password password lastfm.password \"\";"
     "property \"Scrobble URL\" entry lastfm.scrobbler_url \""SCROBBLER_URL_LFM"\";"
     "property \"Prefer Album Artist over Artist field\" checkbox lastfm.prefer_album_artist 0;"
+    "property \"Send MusicBrainz ID\" checkbox lastfm.mbid 0;"
+    "property \"Submit tracks shorter than 30 seconds (not recommended)\" checkbox lastfm.submit_tiny_tracks 0;"
 ;
 
 // define plugin interface
@@ -996,7 +995,8 @@ static DB_misc_t plugin = {
     .plugin.name = "last.fm scrobbler",
     .plugin.descr = "Sends played songs information to your last.fm account, or other service that use AudioScrobbler protocol",
     .plugin.copyright =
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "Last.fm scrobbler plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko\n"
         "\n"
         "This program is free software; you can redistribute it and/or\n"
         "modify it under the terms of the GNU General Public License\n"
diff --git a/plugins/libmp4ff/COPYING b/plugins/libmp4ff/COPYING
index 920c4e6..44cca08 100644
--- a/plugins/libmp4ff/COPYING
+++ b/plugins/libmp4ff/COPYING
@@ -1,3 +1,5 @@
+This copy of libmp4ff has been modified specifically for DeaDBeeF Player.
+Modifications (C) 2009-20014 Alexey Yakovenko.
 
 Any non-GPL usage of this software or parts of this software is strictly
 forbidden.
diff --git a/plugins/libmp4ff/Makefile.am b/plugins/libmp4ff/Makefile.am
index 75e1097..8ef433b 100644
--- a/plugins/libmp4ff/Makefile.am
+++ b/plugins/libmp4ff/Makefile.am
@@ -10,4 +10,4 @@ libmp4ff_a_SOURCES = \
 	mp4tagupdate.c\
 	mp4util.c
 
-libmp4ff_a_CFLAGS = -fPIC -DUSE_TAGGING
+AM_CFLAGS = -fPIC -DUSE_TAGGING
diff --git a/plugins/libmp4ff/Makefile.in b/plugins/libmp4ff/Makefile.in
index 2982070..d58268d 100644
--- a/plugins/libmp4ff/Makefile.in
+++ b/plugins/libmp4ff/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,8 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/libmp4ff
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	AUTHORS COPYING
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp AUTHORS COPYING README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -83,26 +110,54 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
+AM_V_AR = $(am__v_AR_ at AM_V@)
+am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
 libmp4ff_a_AR = $(AR) $(ARFLAGS)
 libmp4ff_a_LIBADD =
-am_libmp4ff_a_OBJECTS = libmp4ff_a-mp4atom.$(OBJEXT) \
-	libmp4ff_a-mp4ff.$(OBJEXT) libmp4ff_a-mp4meta.$(OBJEXT) \
-	libmp4ff_a-mp4sample.$(OBJEXT) \
-	libmp4ff_a-mp4tagupdate.$(OBJEXT) libmp4ff_a-mp4util.$(OBJEXT)
+am_libmp4ff_a_OBJECTS = mp4atom.$(OBJEXT) mp4ff.$(OBJEXT) \
+	mp4meta.$(OBJEXT) mp4sample.$(OBJEXT) mp4tagupdate.$(OBJEXT) \
+	mp4util.$(OBJEXT)
 libmp4ff_a_OBJECTS = $(am_libmp4ff_a_OBJECTS)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libmp4ff_a_SOURCES)
 DIST_SOURCES = $(libmp4ff_a_SOURCES)
 am__can_run_installinfo = \
@@ -110,6 +165,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -136,6 +208,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -156,10 +229,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -182,6 +257,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -235,6 +311,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -253,6 +330,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -278,13 +357,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -293,7 +376,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -363,7 +448,7 @@ libmp4ff_a_SOURCES = \
 	mp4tagupdate.c\
 	mp4util.c
 
-libmp4ff_a_CFLAGS = -fPIC -DUSE_TAGGING
+AM_CFLAGS = -fPIC -DUSE_TAGGING
 all: all-am
 
 .SUFFIXES:
@@ -401,10 +486,11 @@ $(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
 libmp4ff.a: $(libmp4ff_a_OBJECTS) $(libmp4ff_a_DEPENDENCIES) $(EXTRA_libmp4ff_a_DEPENDENCIES) 
-	-rm -f libmp4ff.a
-	$(libmp4ff_a_AR) libmp4ff.a $(libmp4ff_a_OBJECTS) $(libmp4ff_a_LIBADD)
-	$(RANLIB) libmp4ff.a
+	$(AM_V_at)-rm -f libmp4ff.a
+	$(AM_V_AR)$(libmp4ff_a_AR) libmp4ff.a $(libmp4ff_a_OBJECTS) $(libmp4ff_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libmp4ff.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -412,117 +498,33 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmp4ff_a-mp4atom.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmp4ff_a-mp4ff.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmp4ff_a-mp4meta.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmp4ff_a-mp4sample.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmp4ff_a-mp4tagupdate.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmp4ff_a-mp4util.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4atom.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4ff.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4meta.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4sample.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4tagupdate.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4util.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-libmp4ff_a-mp4atom.o: mp4atom.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4atom.o -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4atom.Tpo -c -o libmp4ff_a-mp4atom.o `test -f 'mp4atom.c' || echo '$(srcdir)/'`mp4atom.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmp4ff_a-mp4atom.Tpo $(DEPDIR)/libmp4ff_a-mp4atom.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4atom.c' object='libmp4ff_a-mp4atom.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4atom.o `test -f 'mp4atom.c' || echo '$(srcdir)/'`mp4atom.c
-
-libmp4ff_a-mp4atom.obj: mp4atom.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4atom.obj -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4atom.Tpo -c -o libmp4ff_a-mp4atom.obj `if test -f 'mp4atom.c'; then $(CYGPATH_W) 'mp4atom.c'; else $(CYGPATH_W) '$(srcdir)/mp4atom.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmp4ff_a-mp4atom.Tpo $(DEPDIR)/libmp4ff_a-mp4atom.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4atom.c' object='libmp4ff_a-mp4atom.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4atom.obj `if test -f 'mp4atom.c'; then $(CYGPATH_W) 'mp4atom.c'; else $(CYGPATH_W) '$(srcdir)/mp4atom.c'; fi`
-
-libmp4ff_a-mp4ff.o: mp4ff.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4ff.o -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4ff.Tpo -c -o libmp4ff_a-mp4ff.o `test -f 'mp4ff.c' || echo '$(srcdir)/'`mp4ff.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmp4ff_a-mp4ff.Tpo $(DEPDIR)/libmp4ff_a-mp4ff.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4ff.c' object='libmp4ff_a-mp4ff.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4ff.o `test -f 'mp4ff.c' || echo '$(srcdir)/'`mp4ff.c
-
-libmp4ff_a-mp4ff.obj: mp4ff.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4ff.obj -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4ff.Tpo -c -o libmp4ff_a-mp4ff.obj `if test -f 'mp4ff.c'; then $(CYGPATH_W) 'mp4ff.c'; else $(CYGPATH_W) '$(srcdir)/mp4ff.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmp4ff_a-mp4ff.Tpo $(DEPDIR)/libmp4ff_a-mp4ff.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4ff.c' object='libmp4ff_a-mp4ff.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4ff.obj `if test -f 'mp4ff.c'; then $(CYGPATH_W) 'mp4ff.c'; else $(CYGPATH_W) '$(srcdir)/mp4ff.c'; fi`
-
-libmp4ff_a-mp4meta.o: mp4meta.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4meta.o -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4meta.Tpo -c -o libmp4ff_a-mp4meta.o `test -f 'mp4meta.c' || echo '$(srcdir)/'`mp4meta.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmp4ff_a-mp4meta.Tpo $(DEPDIR)/libmp4ff_a-mp4meta.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4meta.c' object='libmp4ff_a-mp4meta.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4meta.o `test -f 'mp4meta.c' || echo '$(srcdir)/'`mp4meta.c
-
-libmp4ff_a-mp4meta.obj: mp4meta.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4meta.obj -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4meta.Tpo -c -o libmp4ff_a-mp4meta.obj `if test -f 'mp4meta.c'; then $(CYGPATH_W) 'mp4meta.c'; else $(CYGPATH_W) '$(srcdir)/mp4meta.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmp4ff_a-mp4meta.Tpo $(DEPDIR)/libmp4ff_a-mp4meta.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4meta.c' object='libmp4ff_a-mp4meta.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4meta.obj `if test -f 'mp4meta.c'; then $(CYGPATH_W) 'mp4meta.c'; else $(CYGPATH_W) '$(srcdir)/mp4meta.c'; fi`
-
-libmp4ff_a-mp4sample.o: mp4sample.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4sample.o -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4sample.Tpo -c -o libmp4ff_a-mp4sample.o `test -f 'mp4sample.c' || echo '$(srcdir)/'`mp4sample.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmp4ff_a-mp4sample.Tpo $(DEPDIR)/libmp4ff_a-mp4sample.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4sample.c' object='libmp4ff_a-mp4sample.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4sample.o `test -f 'mp4sample.c' || echo '$(srcdir)/'`mp4sample.c
-
-libmp4ff_a-mp4sample.obj: mp4sample.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4sample.obj -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4sample.Tpo -c -o libmp4ff_a-mp4sample.obj `if test -f 'mp4sample.c'; then $(CYGPATH_W) 'mp4sample.c'; else $(CYGPATH_W) '$(srcdir)/mp4sample.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmp4ff_a-mp4sample.Tpo $(DEPDIR)/libmp4ff_a-mp4sample.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4sample.c' object='libmp4ff_a-mp4sample.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4sample.obj `if test -f 'mp4sample.c'; then $(CYGPATH_W) 'mp4sample.c'; else $(CYGPATH_W) '$(srcdir)/mp4sample.c'; fi`
-
-libmp4ff_a-mp4tagupdate.o: mp4tagupdate.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4tagupdate.o -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4tagupdate.Tpo -c -o libmp4ff_a-mp4tagupdate.o `test -f 'mp4tagupdate.c' || echo '$(srcdir)/'`mp4tagupdate.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmp4ff_a-mp4tagupdate.Tpo $(DEPDIR)/libmp4ff_a-mp4tagupdate.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4tagupdate.c' object='libmp4ff_a-mp4tagupdate.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4tagupdate.o `test -f 'mp4tagupdate.c' || echo '$(srcdir)/'`mp4tagupdate.c
-
-libmp4ff_a-mp4tagupdate.obj: mp4tagupdate.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4tagupdate.obj -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4tagupdate.Tpo -c -o libmp4ff_a-mp4tagupdate.obj `if test -f 'mp4tagupdate.c'; then $(CYGPATH_W) 'mp4tagupdate.c'; else $(CYGPATH_W) '$(srcdir)/mp4tagupdate.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmp4ff_a-mp4tagupdate.Tpo $(DEPDIR)/libmp4ff_a-mp4tagupdate.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4tagupdate.c' object='libmp4ff_a-mp4tagupdate.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4tagupdate.obj `if test -f 'mp4tagupdate.c'; then $(CYGPATH_W) 'mp4tagupdate.c'; else $(CYGPATH_W) '$(srcdir)/mp4tagupdate.c'; fi`
-
-libmp4ff_a-mp4util.o: mp4util.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4util.o -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4util.Tpo -c -o libmp4ff_a-mp4util.o `test -f 'mp4util.c' || echo '$(srcdir)/'`mp4util.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmp4ff_a-mp4util.Tpo $(DEPDIR)/libmp4ff_a-mp4util.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4util.c' object='libmp4ff_a-mp4util.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4util.o `test -f 'mp4util.c' || echo '$(srcdir)/'`mp4util.c
-
-libmp4ff_a-mp4util.obj: mp4util.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4util.obj -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4util.Tpo -c -o libmp4ff_a-mp4util.obj `if test -f 'mp4util.c'; then $(CYGPATH_W) 'mp4util.c'; else $(CYGPATH_W) '$(srcdir)/mp4util.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmp4ff_a-mp4util.Tpo $(DEPDIR)/libmp4ff_a-mp4util.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4util.c' object='libmp4ff_a-mp4util.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4util.obj `if test -f 'mp4util.c'; then $(CYGPATH_W) 'mp4util.c'; else $(CYGPATH_W) '$(srcdir)/mp4util.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -530,26 +532,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -561,15 +552,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -578,6 +565,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -719,18 +721,19 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/libmp4ff/mp4ffint.h b/plugins/libmp4ff/mp4ffint.h
index e0d335b..dfdf64e 100644
--- a/plugins/libmp4ff/mp4ffint.h
+++ b/plugins/libmp4ff/mp4ffint.h
@@ -132,7 +132,7 @@ extern "C" {
 #define ATOM_SCHI 25
 
 #ifdef HAVE_CONFIG_H
-#include "../../config.h"   
+#include "../../config.h"
 #endif
 
 #if !(defined(_WIN32) || defined(_WIN32_WCE))
diff --git a/plugins/liboggedit/Makefile.am b/plugins/liboggedit/Makefile.am
new file mode 100644
index 0000000..e4da484
--- /dev/null
+++ b/plugins/liboggedit/Makefile.am
@@ -0,0 +1,9 @@
+if HAVE_OGG
+noinst_LIBRARIES = liboggedit.a
+liboggedit_a_SOURCES = oggedit_internal.h oggedit.h \
+	oggedit_internal.c oggedit_utils.c oggedit_art.c oggedit_opus.c oggedit_vorbis.c oggedit_flac.c
+if HAVE_OGG_STREAM_FLUSH_FILL
+OGG_CFLAGS += -DHAVE_OGG_STREAM_FLUSH_FILL
+endif
+AM_CFLAGS = $(OGG_CFLAGS) -fPIC -std=c99
+endif
diff --git a/plugins/coreaudio/Makefile.in b/plugins/liboggedit/Makefile.in
similarity index 65%
copy from plugins/coreaudio/Makefile.in
copy to plugins/liboggedit/Makefile.in
index 296cbc9..639da40 100644
--- a/plugins/coreaudio/Makefile.in
+++ b/plugins/liboggedit/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,8 +78,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = plugins/coreaudio
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ at HAVE_OGG_STREAM_FLUSH_FILL_TRUE@@HAVE_OGG_TRUE at am__append_1 = -DHAVE_OGG_STREAM_FLUSH_FILL
+subdir = plugins/liboggedit
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -80,65 +109,84 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(pkglibdir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
- at HAVE_COREAUDIO_TRUE@coreaudio_la_DEPENDENCIES =  \
- at HAVE_COREAUDIO_TRUE@	$(am__DEPENDENCIES_1)
-am__coreaudio_la_SOURCES_DIST = coreaudio.c
- at HAVE_COREAUDIO_TRUE@am_coreaudio_la_OBJECTS = coreaudio.lo
-coreaudio_la_OBJECTS = $(am_coreaudio_la_OBJECTS)
-coreaudio_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(coreaudio_la_LDFLAGS) $(LDFLAGS) -o $@
- at HAVE_COREAUDIO_TRUE@am_coreaudio_la_rpath = -rpath $(pkglibdir)
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_ at AM_V@)
+am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+liboggedit_a_AR = $(AR) $(ARFLAGS)
+liboggedit_a_LIBADD =
+am__liboggedit_a_SOURCES_DIST = oggedit_internal.h oggedit.h \
+	oggedit_internal.c oggedit_utils.c oggedit_art.c \
+	oggedit_opus.c oggedit_vorbis.c oggedit_flac.c
+ at HAVE_OGG_TRUE@am_liboggedit_a_OBJECTS = oggedit_internal.$(OBJEXT) \
+ at HAVE_OGG_TRUE@	oggedit_utils.$(OBJEXT) oggedit_art.$(OBJEXT) \
+ at HAVE_OGG_TRUE@	oggedit_opus.$(OBJEXT) oggedit_vorbis.$(OBJEXT) \
+ at HAVE_OGG_TRUE@	oggedit_flac.$(OBJEXT)
+liboggedit_a_OBJECTS = $(am_liboggedit_a_OBJECTS)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(coreaudio_la_SOURCES)
-DIST_SOURCES = $(am__coreaudio_la_SOURCES_DIST)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(liboggedit_a_SOURCES)
+DIST_SOURCES = $(am__liboggedit_a_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -165,6 +213,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -185,10 +234,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -211,6 +262,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -264,6 +316,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -282,6 +335,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@ $(am__append_1)
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -307,13 +362,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -322,7 +381,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -380,11 +441,11 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
- at HAVE_COREAUDIO_TRUE@pkglib_LTLIBRARIES = coreaudio.la
- at HAVE_COREAUDIO_TRUE@coreaudio_la_SOURCES = coreaudio.c
- at HAVE_COREAUDIO_TRUE@coreaudio_la_LDFLAGS = -module
- at HAVE_COREAUDIO_TRUE@coreaudio_la_LIBADD = $(LDADD) $(COREAUDIO_LIBS)
- at HAVE_COREAUDIO_TRUE@AM_CFLAGS = $(CFLAGS) -std=c99 $(COREAUDIO_CFLAGS)
+ at HAVE_OGG_TRUE@noinst_LIBRARIES = liboggedit.a
+ at HAVE_OGG_TRUE@liboggedit_a_SOURCES = oggedit_internal.h oggedit.h \
+ at HAVE_OGG_TRUE@	oggedit_internal.c oggedit_utils.c oggedit_art.c oggedit_opus.c oggedit_vorbis.c oggedit_flac.c
+
+ at HAVE_OGG_TRUE@AM_CFLAGS = $(OGG_CFLAGS) -fPIC -std=c99
 all: all-am
 
 .SUFFIXES:
@@ -398,9 +459,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/coreaudio/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/liboggedit/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu plugins/coreaudio/Makefile
+	  $(AUTOMAKE) --gnu plugins/liboggedit/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -419,40 +480,14 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
-	}
-
-uninstall-pkglibLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
-	done
 
-clean-pkglibLTLIBRARIES:
-	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-coreaudio.la: $(coreaudio_la_OBJECTS) $(coreaudio_la_DEPENDENCIES) $(EXTRA_coreaudio_la_DEPENDENCIES) 
-	$(coreaudio_la_LINK) $(am_coreaudio_la_rpath) $(coreaudio_la_OBJECTS) $(coreaudio_la_LIBADD) $(LIBS)
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+liboggedit.a: $(liboggedit_a_OBJECTS) $(liboggedit_a_DEPENDENCIES) $(EXTRA_liboggedit_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f liboggedit.a
+	$(AM_V_AR)$(liboggedit_a_AR) liboggedit.a $(liboggedit_a_OBJECTS) $(liboggedit_a_LIBADD)
+	$(AM_V_at)$(RANLIB) liboggedit.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -460,28 +495,33 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/coreaudio.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/oggedit_art.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/oggedit_flac.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/oggedit_internal.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/oggedit_opus.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/oggedit_utils.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/oggedit_vorbis.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,26 +529,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +549,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +562,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -573,11 +613,8 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(pkglibdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -610,7 +647,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -637,7 +674,7 @@ install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-pkglibLTLIBRARIES
+install-exec-am:
 
 install-html: install-html-am
 
@@ -677,23 +714,23 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-pkglibLTLIBRARIES
+uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+	tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/liboggedit/oggedit.h b/plugins/liboggedit/oggedit.h
new file mode 100644
index 0000000..94f08e3
--- /dev/null
+++ b/plugins/liboggedit/oggedit.h
@@ -0,0 +1,94 @@
+/*
+  This file is part of Deadbeef Player source code
+  http://deadbeef.sourceforge.net
+
+  DeaDBeeF Ogg Edit library header
+
+  Copyright (C) 2014 Ian Nartowicz <deadbeef at nartowicz.co.uk>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+*/
+
+#ifndef __OGGEDIT_H
+#define __OGGEDIT_H
+
+#define ALBUM_ART_KEY "METADATA_BLOCK_PICTURE"
+#define ALBUM_ART_META "metadata_block_picture"
+
+#define OGGEDIT_OK 1
+/* End Of File, usually unexpected */
+#define OGGEDIT_EOF 0
+/* Generic error or system call return value */
+#define OGGEDIT_FAULT -1
+/* Couldn't sync to Ogg pages, either not an Ogg file, or highly corrupt */
+#define OGGEDIT_CANT_FIND_STREAM -2
+/* Input file not opened for reading, unlikely */
+#define OGGEDIT_FILE_NOT_OPEN -3
+/* Seeking in the input file failed, fatal I/O error */
+#define OGGEDIT_SEEK_FAILED -4
+/* Memory allocation failure */
+#define OGGEDIT_ALLOCATION_FAILURE -5
+/* Couldn't extract the vendor from a header packet, file probably corrupt or not the right codec */
+#define OGGEDIT_CANNOT_PARSE_HEADERS -6
+/* Error adding pages to a stream to read a packet, badly corrupt or fatal Ogg internal error */
+#define OGGEDIT_FAILED_TO_STREAM_PAGE_FOR_PACKET -7
+/* Error adding packets to a stream to write pages, usually a fatal Ogg internal error */
+#define OGGEDIT_FAILED_TO_STREAM_PACKET_FOR_PAGE -8
+/* ogg_stream_init() failed, fatal Ogg internal error */
+#define OGGEDIT_FAILED_TO_INIT_STREAM -9
+/* New file cannot be opened for writing, invalid path or no permissions */
+#define OGGEDIT_CANNOT_OPEN_OUTPUT_FILE -10
+/* File cannot be opened for writing, probably no write permission */
+#define OGGEDIT_CANNOT_UPDATE_FILE -11
+/* Temporary file cannot be created (no permissions?) */
+#define OGGEDIT_CANNOT_OPEN_TEMPORARY_FILE -12
+/* Stat comment failed */
+#define OGGEDIT_STAT_FAILED -13
+/* I/O error writing to file (disk full?) */
+#define OGGEDIT_WRITE_ERROR -14
+/* Failed to flush pages from a stream, fatal Ogg internal error */
+#define OGGEDIT_FLUSH_FAILED -15
+/* Renaming tewmporary file failed (usually sticky bit or directory permissions) */
+#define OGGEDIT_RENAME_FAILED -16
+/* Image file length not acceptable */
+#define OGGEDIT_BAD_FILE_LENGTH -100
+/* Cannot read data from image file */
+#define OGGEDIT_CANT_READ_IMAGE_FILE -101
+
+/* oggedit_utils.c */
+uint8_t *oggedit_vorbis_channel_map(const int channel_count);
+const char *oggedit_map_tag(char *key, const char *in_or_out);
+
+/* oggedit_art.c */
+const char *oggedit_album_art_type(const int type);
+char *oggedit_album_art_tag(DB_FILE *fp, int *res);
+
+/* oggedit_flac.c */
+off_t oggedit_flac_stream_info(DB_FILE *in, const off_t start_offset, const off_t end_offset);
+off_t oggedit_write_flac_metadata(DB_FILE *in, const char *fname, const off_t offset, const int num_tags, char **tags);
+
+/* oggedit_vorbis.c */
+off_t oggedit_vorbis_stream_info(DB_FILE *in, const off_t start_offset, const off_t end_offset, char **codecs);
+off_t oggedit_write_vorbis_metadata(DB_FILE *in, const char *fname, const off_t offset, const size_t stream_size, const int num_tags, char **tags);
+
+/* oggedit_opus.c */
+int oggedit_write_opus_file(DB_FILE *in, const char *outname, const off_t offset, const bool all_streams);
+off_t oggedit_opus_stream_info(DB_FILE *in, const off_t start_offset, const off_t end_offset, char **codecs);
+off_t oggedit_write_opus_metadata(DB_FILE *in, const char *fname, const off_t offset, const size_t stream_size, const int output_gain, const int num_tags, char **tags);
+
+#endif /* __OGGEDIT_H */
diff --git a/plugins/liboggedit/oggedit_art.c b/plugins/liboggedit/oggedit_art.c
new file mode 100644
index 0000000..79b1e78
--- /dev/null
+++ b/plugins/liboggedit/oggedit_art.c
@@ -0,0 +1,168 @@
+/*
+  This file is part of Deadbeef Player source code
+  http://deadbeef.sourceforge.net
+
+  DeaDBeeF Ogg Edit library album art functions
+
+  Copyright (C) 2014 Ian Nartowicz <deadbeef at nartowicz.co.uk>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+#include "oggedit_internal.h"
+
+const char *oggedit_album_art_type(const int type)
+{
+    switch (type) {
+        case 1:
+            return "32x32 pixels file icon";
+        case 2:
+            return "other file icon";
+        case 3:
+            return "front cover";
+        case 4:
+            return "back cover";
+        case 5:
+            return "leaflet page";
+        case 6:
+            return "media";
+        case 7:
+            return "lead artist/lead performer/soloist";
+        case 8:
+            return "artist/performer";
+        case 9:
+            return "conductor";
+        case 10:
+            return "band/orchestra";
+        case 11:
+            return "composer";
+        case 12:
+            return "lyricist/text writer";
+        case 13:
+            return "recording location";
+        case 14:
+            return "during recording";
+        case 15:
+            return "during performance";
+        case 16:
+            return "movie/video screen capture";
+        case 17:
+            return "bright coloured fish";
+        case 18:
+            return "illustration";
+        case 19:
+            return "band/artist logotype";
+        case 20:
+            return "publisher/studio logotype";
+        default:
+            return "other";
+    }
+}
+
+static char *btoa(const unsigned char *binary, const size_t binary_length)
+{
+    const char b64[64] = {
+        'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
+        'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z',
+        '0','1','2','3','4','5','6','7','8','9','+','/'
+    };
+
+    char *ascii_base64 = malloc((binary_length-1)/3 * 4 + 5);
+    if (!ascii_base64)
+        return NULL;
+
+    char *p = ascii_base64;
+    const unsigned char *q = binary;
+    const unsigned char *binary_end = binary + binary_length;
+    while (q+2 < binary_end) {
+        uint32_t chunk = q[0]<<16 | q[1]<<8 | q[2];
+        p[3] = b64[chunk & 0x3f];
+        p[2] = b64[chunk>>6 & 0x3f];
+        p[1] = b64[chunk>>12 & 0x3f];
+        p[0] = b64[chunk>>18 & 0x3f];
+        p+=4, q+=3;
+    }
+
+    if (q < binary_end) {
+        uint16_t remainder = q[0]<<8 | (q+1 == binary_end ? '\0' : q[1]);
+        p[3] = '=';
+        p[2] = q+1 == binary_end ? '=' : b64[remainder<<2 & 0x3f];
+        p[1] = b64[remainder>>4 & 0x3f];
+        p[0] = b64[remainder>>10 & 0x3f];
+        p+=4;
+    }
+    *p = '\0';
+
+    return ascii_base64;
+}
+
+char *oggedit_album_art_tag(DB_FILE *fp, int *res)
+{
+    if (!fp) {
+        *res = OGGEDIT_FILE_NOT_OPEN;
+        return NULL;
+    }
+
+    const int64_t data_length = fp->vfs->getlength(fp);
+    if (data_length < 50 || data_length > 10000000) {
+        fp->vfs->close(fp);
+        *res = OGGEDIT_BAD_FILE_LENGTH;
+        return NULL;
+    }
+
+    char *data = malloc(data_length);
+    if (!data) {
+        fp->vfs->close(fp);
+        *res = OGGEDIT_ALLOCATION_FAILURE;
+        return NULL;
+    }
+
+    const size_t data_read = fp->vfs->read(data, 1, data_length, fp);
+    fp->vfs->close(fp);
+    if (data_read != data_length) {
+        free(data);
+        *res = OGGEDIT_CANT_READ_IMAGE_FILE;
+        return NULL;
+    }
+
+    oggpack_buffer opb;
+    oggpackB_writeinit(&opb);
+    oggpackB_write(&opb, 3, 32);
+    _oggpackB_string(&opb, memcmp(data, "\x89PNG\x0D\x0A\x1A\x0A", 8) ? "image/jpeg" : "image/png");
+    _oggpackB_string(&opb, "Album art added from DeaDBeeF");
+    oggpackB_write(&opb, 1, 32); /* workaround for opusfile bug */
+    oggpackB_write(&opb, 1, 32);
+    oggpackB_write(&opb, 1, 32);
+    oggpackB_write(&opb, 0, 32);
+    oggpackB_write(&opb, data_length, 32);
+    _oggpack_chars(&opb, data, data_length);
+    free(data);
+    if (oggpack_writecheck(&opb)) {
+        *res = OGGEDIT_ALLOCATION_FAILURE;
+        return NULL;
+    }
+
+    char *tag = btoa(oggpackB_get_buffer(&opb), oggpackB_bytes(&opb));
+    oggpackB_writeclear(&opb);
+    return tag;
+}
diff --git a/plugins/liboggedit/oggedit_flac.c b/plugins/liboggedit/oggedit_flac.c
new file mode 100644
index 0000000..9aa8971
--- /dev/null
+++ b/plugins/liboggedit/oggedit_flac.c
@@ -0,0 +1,225 @@
+/*
+  This file is part of Deadbeef Player source code
+  http://deadbeef.sourceforge.net
+
+  DeaDBeeF Ogg Edit library Flac functions
+
+  Copyright (C) 2014 Ian Nartowicz <deadbeef at nartowicz.co.uk>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "oggedit_internal.h"
+
+#define PADTYPE 0x01
+#define VCTYPE 0x04
+#define LASTBLOCK 0x80
+
+off_t oggedit_flac_stream_info(DB_FILE *in, const off_t start_offset, const off_t end_offset)
+{
+    ogg_sync_state oy;
+    ogg_sync_init(&oy);
+    const off_t stream_size = codec_stream_size(in, &oy, start_offset, end_offset, FLACNAME);
+    cleanup(in, NULL, &oy, NULL);
+    return stream_size;
+}
+
+static void clear_header_list(ogg_packet **headers)
+{
+    if (headers) {
+        for (ogg_packet **header = headers; *header; header++) {
+            ogg_packet_clear(*header);
+            free(*header);
+        }
+        free(headers);
+    }
+}
+
+static ogg_packet **headers_alloc(ogg_packet **headers, const size_t packets)
+{
+    ogg_packet **new_headers = realloc(headers, (packets+2) * sizeof(headers));
+    if (!new_headers) {
+        clear_header_list(headers);
+        return NULL;
+    }
+
+    if (!(new_headers[packets] = malloc(sizeof(ogg_packet)))) {
+        clear_header_list(new_headers);
+        return NULL;
+    }
+
+    new_headers[packets + 1] = NULL;
+    return new_headers;
+}
+
+static ogg_packet **metadata_block_packets(DB_FILE *in, ogg_sync_state *oy, const off_t offset, char **vendor, int *res)
+{
+    ogg_stream_state os;
+    ogg_page og;
+    if ((*res = init_read_stream(in, oy, &os, &og, offset, FLACNAME)) <= OGGEDIT_EOF)
+        return NULL;
+
+    int pages = 1;
+    size_t packets = 0;
+    ogg_packet **headers = NULL;
+    while ((headers = headers_alloc(headers, packets)) &&
+           (pages = read_packet(in, oy, &os, &og, headers[packets], pages)) > OGGEDIT_EOF &&
+           (headers[packets++]->packet[0] & LASTBLOCK) != LASTBLOCK);
+
+    ogg_stream_clear(&os);
+
+    if (!headers)
+        *res = OGGEDIT_ALLOCATION_FAILURE;
+    else if (!packets || (headers[0]->packet[0] & 0x3F) != VCTYPE)
+        *res = OGGEDIT_CANNOT_PARSE_HEADERS;
+    else
+        *res = pages;
+    if (*res <= OGGEDIT_EOF) {
+        clear_header_list(headers);
+        return NULL;
+    }
+
+    *vendor = parse_vendor(headers[0], 4);
+#ifdef HAVE_OGG_STREAM_FLUSH_FILL
+    size_t bytes = 0;
+    for (size_t i = 0; i < packets; i++)
+        bytes += headers[i]->bytes;
+    if (bytes < MAXPAYLOAD * (pages-1))
+        headers[0]->bytes = 4;
+#else
+    headers[0]->bytes = 4; // not safe to pad without ogg_stream_flush_fill
+#endif
+
+    *res = OGGEDIT_OK;
+    return headers;
+}
+
+static long write_metadata_block_packets(FILE *out, const int serial, const char *vendor, const size_t num_tags, char **tags, size_t padding, ogg_packet **metadata)
+{
+    const size_t header_length = vc_size(vendor, num_tags, tags);
+    if (header_length > (2<<24))
+        return OGGEDIT_ALLOCATION_FAILURE;
+
+    char magic[4];
+    magic[0] = VCTYPE;
+    magic[1] = header_length >> 16 & 0xFF;
+    magic[2] = header_length >> 8 & 0xFF;
+    magic[3] = header_length & 0xFF;
+    ogg_packet_clear(metadata[0]);
+    if (!fill_vc_packet(magic, 4, vendor, num_tags, tags, false, padding, metadata[0]))
+        return OGGEDIT_ALLOCATION_FAILURE;
+
+    ogg_stream_state os;
+    if (ogg_stream_init(&os, serial))
+        return OGGEDIT_FAILED_TO_INIT_STREAM;
+    os.b_o_s = 1;
+    os.pageno = 1;
+
+    for (int i = 0; metadata[i]; i++) {
+        if (!metadata[i+1])
+            metadata[i]->packet[0] |= LASTBLOCK;
+        ogg_stream_packetin(&os, metadata[i]);
+    }
+
+    return flush_stream(out, &os);
+}
+
+off_t oggedit_write_flac_metadata(DB_FILE *in, const char *fname, const off_t offset, const int num_tags, char **tags)
+{
+    off_t res;
+    char tempname[PATH_MAX] = "";
+    ogg_packet **headers = NULL;
+    char *vendor = NULL;
+    ogg_sync_state oy;
+    ogg_sync_init(&oy);
+
+    /* Original file must be writable whichever way we update it */
+    FILE *out = fopen(fname, "r+b");
+    if (!out) {
+        res = OGGEDIT_CANNOT_UPDATE_FILE;
+        goto cleanup;
+    }
+
+    /* See if we can write the tags packet directly into the existing file ... */
+    if (!(headers = metadata_block_packets(in, &oy, offset, &vendor, (int *)&res)))
+        goto cleanup;
+    const off_t stream_size_k = in->vfs->getlength(in) / 1000; // use file size for now
+    const size_t metadata_size = 4 + vc_size(vendor, num_tags, tags);
+    ptrdiff_t padding = headers[0]->bytes - metadata_size;
+    if (stream_size_k < 1000 || padding < 0 || (headers[1] && padding > 0) || padding > stream_size_k+metadata_size) {
+        res = open_temp_file(fname, tempname, &out);
+        if (res) {
+            goto cleanup;
+        }
+    }
+
+    /* Re-pad if writing the whole file */
+    if (*tempname) {
+        size_t i = 0, j = 0;
+        while (headers[i]) {
+            headers[j++] = headers[i];
+            while (headers[++i] && (headers[i]->packet[0] & 0x3F) == PADTYPE) {
+                ogg_packet_clear(headers[i]);
+                free(headers[i]);
+            }
+        }
+        headers[j] = NULL;
+        padding = headers[1] || stream_size_k < 900 ? 0 : stream_size_k < 10000 ? 1024 : stream_size_k < 100000 ? 8192 : 65536;
+    }
+
+    /* Write pages until we reach the correct comment header */
+    ogg_page og;
+    const int flac_serial = copy_up_to_codec(in, out, &oy, &og, *tempname ? 0 : offset, offset, FLACNAME);
+    if (flac_serial <= OGGEDIT_EOF) {
+        res = flac_serial;
+        goto cleanup;
+    }
+    if ((res = copy_up_to_header(in, out, &oy, &og, flac_serial)) <= OGGEDIT_EOF)
+        goto cleanup;
+    const long pageno = write_metadata_block_packets(out, flac_serial, vendor, num_tags, tags, padding, headers);
+    if (pageno < OGGEDIT_EOF) {
+        res = pageno;
+        goto cleanup;
+    }
+
+    /* If we have tempfile, copy the remaining pages */
+    if (*tempname) {
+        if ((res = copy_remaining_pages(in, out, &oy, flac_serial, pageno)) <= OGGEDIT_EOF)
+            goto cleanup;
+        if (rename(tempname, fname)) {
+            res = OGGEDIT_RENAME_FAILED;
+            goto cleanup;
+        }
+    }
+
+    res = file_size(fname);
+
+cleanup:
+    clear_header_list(headers);
+    cleanup(in, out, &oy, vendor);
+    if (res < OGGEDIT_OK)
+        unlink(tempname);
+    return res;
+}
+
diff --git a/plugins/liboggedit/oggedit_internal.c b/plugins/liboggedit/oggedit_internal.c
new file mode 100644
index 0000000..c8257da
--- /dev/null
+++ b/plugins/liboggedit/oggedit_internal.c
@@ -0,0 +1,532 @@
+/*
+  This file is part of Deadbeef Player source code
+  http://deadbeef.sourceforge.net
+
+  DeaDBeeF Ogg Edit library internal functions
+
+  Copyright (C) 2014 Ian Nartowicz <deadbeef at nartowicz.co.uk>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <libgen.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include "oggedit_internal.h"
+
+static char *cat_string(char *dest, const char *src, const char *sep)
+{
+    char *more = realloc(dest, strlen(dest) + strlen(src) + strlen(sep) + 1);
+    if (!more) {
+        free(dest);
+        return NULL;
+    }
+    return strcat(strcat(more, sep), src);
+}
+
+static const char *codec_name(ogg_page *og)
+{
+    typedef struct {
+        const size_t length;
+        const char *codec;
+        const char *magic;
+    } codec_t;
+    const codec_t codecs[] = {
+        {.codec = OPUSNAME,   .length = 19, .magic = "OpusHead"},
+        {.codec = VORBISNAME, .length = 30, .magic = "\1vorbis"},
+        {.codec = FLACNAME,   .length = 47, .magic = "\177FLAC"},
+        {.codec = "Speex",    .length = 80, .magic = "Speex   "},
+        {.codec = "Celt",     .length = 80, .magic = "CELT"}, // obsolete
+        {.codec = "MIDI",     .length = 13, .magic = "OggMIDI\0"},
+        {.codec = "PCM",      .length = 28, .magic = "PCM     "},
+        {.codec = "Theora",   .length = 42, .magic = "\200theora"},
+        {.codec = "Daala",    .length = 38, .magic = "\200daala"},
+        {.codec = "Dirac",    .length = 5,  .magic = "BBCD\0"},
+        {.codec = "Skeleton", .length = 80, .magic = "fishead\0"},
+        {.codec = "Kate",     .length = 64, .magic = "\200kate\0\0\0"},
+        {.codec = "CMML",     .length = 29, .magic = "CMML\0\0\0\0"},
+        {.codec = "YUV4MPEG", .length = 8,  .magic = "YUV4Mpeg"},
+        {.codec = "UVS",      .length = 48, .magic = "UVS     "},
+        {.codec = "YUV",      .length = 32, .magic = "\0YUV"},
+        {.codec = "RGB",      .length = 24, .magic = "\0RGB"},
+        {.codec = "JNG",      .length = 48, .magic = "\213JNG\r\n\032\n"},
+        {.codec = "MNG",      .length = 48, .magic = "\212MNG\r\n\032\n"},
+        {.codec = "PNG",      .length = 48, .magic = "\211PNG\r\n\032\n"},
+        {.codec = "Spots",    .length = 52, .magic = "SPOTS\0\0\0"},
+        {.codec = NULL}
+    };
+
+    for (const codec_t *match = codecs; match->codec; match++)
+        if ((size_t)og->body_len >= match->length && !memcmp(og->body, match->magic, strlen(match->codec)))
+            return match->codec;
+
+    return "unknown";
+}
+
+void _oggpack_chars(oggpack_buffer *opb, const char *s, size_t length)
+{
+//    oggpack_writecopy(opb, s, length * 8); currently broken
+    while (length--)
+        oggpack_write(opb, *s++, 8);
+}
+
+void _oggpack_string(oggpack_buffer *opb, const char *s)
+{
+    oggpack_write(opb, strlen(s), 32);
+    _oggpack_chars(opb, s, strlen(s));
+}
+
+void _oggpackB_string(oggpack_buffer *opb, const char *s)
+{
+    oggpackB_write(opb, strlen(s), 32);
+    _oggpack_chars(opb, s, strlen(s));
+}
+
+static bool ensure_directory(const char *path)
+{
+    struct stat stat_struct;
+    if (!stat(path, &stat_struct))
+        return !S_ISDIR(stat_struct.st_mode);
+
+    if (errno != ENOENT)
+        return false;
+
+    char* dir = strdup(path);
+    if (!dir)
+        return false;
+
+    const int bad_dir = ensure_directory(dirname(dir));
+    free(dir);
+
+    return !bad_dir && !mkdir(path, 0777);
+}
+
+FILE *open_new_file(const char *outname)
+{
+    char outpath[PATH_MAX];
+    strcpy(outpath, outname);
+    if (!ensure_directory(dirname(outpath)))
+        return NULL;
+
+    unlink(outname);
+    return fopen(outname, "wbx");
+}
+
+int open_temp_file(const char *fname, char *tempname, FILE **out)
+{
+    snprintf(tempname, PATH_MAX, "%s.temp", fname);
+    unlink(tempname);
+    if (!(*out = freopen(tempname, "abx", *out)))
+        return OGGEDIT_CANNOT_OPEN_TEMPORARY_FILE;
+
+    struct stat stat_struct;
+    if (!stat(fname, &stat_struct)) {
+        chmod(tempname, stat_struct.st_mode);
+    }
+
+    return 0;
+}
+
+off_t file_size(const char *fname)
+{
+    struct stat sb;
+    if (stat(fname, &sb))
+        return OGGEDIT_STAT_FAILED;
+
+    return sb.st_size;
+}
+
+void cleanup(DB_FILE *in, FILE *out, ogg_sync_state *oy, void *buffer)
+{
+    if (in)
+        in->vfs->close(in);
+
+    if (out)
+        fclose(out);
+
+    ogg_sync_clear(oy);
+
+    if (buffer)
+        free(buffer);
+}
+
+static int get_page(DB_FILE *in, ogg_sync_state *oy, ogg_page *og)
+{
+    uint16_t chunks_left = MAXPAGE / CHUNKSIZE;
+    while (ogg_sync_pageout(oy, og) != 1) {
+        char *buffer = ogg_sync_buffer(oy, CHUNKSIZE);
+        if (!in || !buffer || !chunks_left--)
+            return OGGEDIT_CANT_FIND_STREAM;
+
+        const size_t bytes = in->vfs->read(buffer, 1, CHUNKSIZE, in);
+        if (!bytes)
+            return OGGEDIT_EOF;
+
+        ogg_sync_wrote(oy, bytes);
+    }
+
+    return ogg_page_serialno(og);
+}
+
+static int skip_to_bos(DB_FILE *in, ogg_sync_state *oy, ogg_page *og, const off_t offset)
+{
+    if (!in)
+        return OGGEDIT_FILE_NOT_OPEN;
+
+    if (in->vfs->seek(in, offset, SEEK_SET))
+        return OGGEDIT_SEEK_FAILED;
+
+    ogg_sync_reset(oy);
+    int serial;
+    do
+        serial = get_page(in, oy, og);
+    while (serial > OGGEDIT_EOF && !ogg_page_bos(og));
+
+    return serial;
+}
+
+static int skip_to_codec(DB_FILE *in, ogg_sync_state *oy, ogg_page *og, const off_t offset, const char *codec)
+{
+    int serial = skip_to_bos(in, oy, og, offset);
+    while (serial > OGGEDIT_EOF && strcmp(codec_name(og), codec))
+        serial = get_page(in, oy, og);
+
+    return serial;
+}
+
+static int skip_to_header(DB_FILE *in, ogg_sync_state *oy, ogg_page *og, int serial, const int codec_serial)
+{
+    while (serial > OGGEDIT_EOF && (ogg_page_bos(og) || serial != codec_serial))
+        serial = get_page(in, oy, og);
+
+    return serial;
+}
+
+static off_t sync_tell(DB_FILE *in, ogg_sync_state *oy, ogg_page *og)
+{
+    return in->vfs->tell(in) - oy->fill + oy->returned - og->header_len - og->body_len;
+}
+
+static bool write_page(FILE *out, ogg_page *og)
+{
+    if (fwrite(og->header, 1, og->header_len, out) != (size_t)og->header_len)
+        return false;
+
+    if (fwrite(og->body, 1, og->body_len, out) != (size_t)og->body_len)
+        return false;
+
+    return true;
+}
+
+static int write_page_and_get_next(DB_FILE *in, FILE *out, ogg_sync_state *oy, ogg_page *og)
+{
+    if (!write_page(out, og))
+        return OGGEDIT_WRITE_ERROR;
+
+    return get_page(in, oy, og);
+}
+
+int copy_up_to_codec(DB_FILE *in, FILE *out, ogg_sync_state *oy, ogg_page *og, const off_t start_offset, const off_t link_offset, const char *codec)
+{
+    int serial = skip_to_bos(in, oy, og, start_offset);
+
+    if (fseek(out, sync_tell(in, oy, og), SEEK_SET))
+        return OGGEDIT_SEEK_FAILED;
+
+    while (serial > OGGEDIT_EOF && (sync_tell(in, oy, og) < link_offset || !ogg_page_bos(og) || strcmp(codec_name(og), codec)))
+        serial = write_page_and_get_next(in, out, oy, og);
+
+    return serial;
+}
+
+int copy_up_to_header(DB_FILE *in, FILE *out, ogg_sync_state *oy, ogg_page *og, const int codec_serial)
+{
+    int serial;
+    do
+        serial = write_page_and_get_next(in, out, oy, og);
+    while (serial > OGGEDIT_EOF && serial != codec_serial);
+    return serial;
+}
+
+long flush_stream(FILE *out, ogg_stream_state *os)
+{
+    ogg_page og;
+#ifdef HAVE_OGG_STREAM_FLUSH_FILL
+    while (ogg_stream_flush_fill(os, &og, MAXPAYLOAD))
+#else
+    while (ogg_stream_flush(os, &og))
+#endif
+        if (!write_page(out, &og))
+            return OGGEDIT_WRITE_ERROR;
+
+    const long pageno = ogg_stream_check(os) ? OGGEDIT_FLUSH_FAILED : ogg_page_pageno(&og);
+    ogg_stream_clear(os);
+    return pageno;
+}
+
+char *codec_names(DB_FILE *in, ogg_sync_state *oy, const off_t link_offset)
+{
+    ogg_page og;
+    int serial = skip_to_bos(in, oy, &og, link_offset);
+    char *codecs = strdup("Ogg");
+    while (codecs && serial > OGGEDIT_EOF && ogg_page_bos(&og)) {
+        codecs = cat_string(codecs, codec_name(&og), strcmp(codecs, "Ogg") ? "/" : " ");
+        serial = get_page(in, oy, &og);
+    }
+
+    if (serial <= OGGEDIT_EOF) {
+        free(codecs);
+        return NULL;
+    }
+
+    return codecs;
+}
+
+off_t codec_stream_size(DB_FILE *in, ogg_sync_state *oy, const off_t start_offset, const off_t end_offset, const char *codec)
+{
+    /* Find codec serial and any other codecs */
+    bool multiplex = false;
+    ogg_page og;
+    int codec_serial = -1;
+    int serial = skip_to_bos(in, oy, &og, start_offset);
+    while (serial > OGGEDIT_EOF && ogg_page_bos(&og)) {
+        if (strcmp(codec_name(&og), codec))
+            multiplex = true;
+        else
+            codec_serial = serial;
+        serial = get_page(in, oy, &og);
+    }
+
+    /* Skip to the first codec data page */
+    while (serial > OGGEDIT_EOF && !(ogg_page_granulepos(&og) > 0 && serial == codec_serial))
+        serial = get_page(in, oy,  &og);
+    if (serial <= OGGEDIT_EOF)
+        return serial;
+
+    off_t stream_size = 0;
+    if (multiplex) {
+        /* Add up all the codec stream pages until EOF or a new link */
+        while (serial > OGGEDIT_EOF && !ogg_page_bos(&og)) {
+            if (serial == codec_serial)
+                stream_size += og.header_len + og.body_len;
+            serial = get_page(in, oy, &og);
+        }
+    }
+    else {
+        /* Find the exact offsets of the start and end of the audio */
+        stream_size -= sync_tell(in, oy, &og);
+        if (in->vfs->seek(in, end_offset, end_offset == 0 ? SEEK_END : SEEK_SET))
+            return OGGEDIT_SEEK_FAILED;
+        stream_size += in->vfs->tell(in);
+        ogg_sync_reset(oy);
+        while ((serial = get_page(in, oy, &og)) > OGGEDIT_EOF && !ogg_page_bos(&og))
+            stream_size += og.header_len + og.body_len;
+    }
+    if (serial < OGGEDIT_EOF)
+        return serial;
+
+    return stream_size;
+}
+
+char *parse_vendor(const ogg_packet *op, const size_t magic_length)
+{
+    if (op->bytes < magic_length + 4)
+        return NULL;
+
+    const uint8_t *p = op->packet + magic_length;
+    const uint32_t vendor_length = *p | *(p+1)<<8 | *(p+2)<<16 | *(p+3)<<24;
+    if (op->bytes < magic_length + 4 + vendor_length)
+        return NULL;
+
+    char *vendor = calloc(vendor_length+1, 1);
+    if (vendor)
+        memcpy(vendor, p+4, vendor_length);
+    return vendor;
+}
+
+int init_read_stream(DB_FILE *in, ogg_sync_state *oy, ogg_stream_state *os, ogg_page *og, const off_t offset, const char *codec)
+{
+    int serial = skip_to_codec(in, oy, og, offset, codec);
+    serial = skip_to_header(in, oy, og, serial, serial);
+    if (serial <= OGGEDIT_EOF)
+        return serial;
+
+    if (ogg_stream_init(os, serial))
+        return OGGEDIT_FAILED_TO_INIT_STREAM;
+
+    os->b_o_s = 1;
+    ogg_stream_pagein(os, og);
+
+    return OGGEDIT_OK;
+}
+
+int read_packet(DB_FILE *in, ogg_sync_state *oy, ogg_stream_state *os, ogg_page *og, ogg_packet *header, int pages)
+{
+    ogg_packet op;
+    do {
+        while (ogg_stream_packetpeek(os, NULL) == 0) {
+            const int serial = get_page(in, oy, og);
+            if (serial <= OGGEDIT_EOF) {
+                return serial;
+            }
+            if (os->serialno == serial) {
+                pages++;
+                ogg_stream_pagein(os, og);
+            }
+        }
+        if (ogg_stream_check(os))
+            return OGGEDIT_FAILED_TO_STREAM_PAGE_FOR_PACKET;
+    } while (ogg_stream_packetout(os, &op) != 1);
+
+    memset(header, '\0', sizeof(*header));
+    if (!header || !(header->packet = malloc(op.bytes))) {
+        free(header);
+        return OGGEDIT_ALLOCATION_FAILURE;
+    }
+
+    header->bytes = op.bytes;
+    memcpy(header->packet, op.packet, op.bytes);
+    return pages;
+}
+
+ogg_packet *fill_vc_packet(const char *magic, const size_t magic_length, const char *vendor, const size_t num_tags, char **tags, const bool framing, const size_t padding, ogg_packet *op)
+{
+    oggpack_buffer opb;
+    oggpack_writeinit(&opb);
+    _oggpack_chars(&opb, magic, magic_length);
+    _oggpack_string(&opb, vendor);
+    oggpack_write(&opb, num_tags, 32);
+    for (size_t i = 0; i < num_tags; i++)
+        _oggpack_string(&opb, tags[i]);
+    if (framing) {
+        oggpack_write(&opb, 1, 1);
+        oggpack_writealign(&opb);
+    }
+#ifdef HAVE_OGG_STREAM_FLUSH_FILL
+    for (size_t i = 0; i < padding; i++)
+        oggpack_write(&opb, 0, 8); // use oggpack_writecopy when it is fixed
+#endif
+    if (oggpack_writecheck(&opb))
+        return NULL;
+
+    if (op) {
+        memset(op, '\0', sizeof(*op));
+        op->bytes = oggpack_bytes(&opb);
+        op->packet = malloc(op->bytes);
+        if (op->packet) {
+            memcpy(op->packet, oggpack_get_buffer(&opb), op->bytes);
+        }
+    }
+    oggpack_writeclear(&opb);
+
+    if (!op->packet)
+        return NULL;
+
+    return op;
+}
+
+size_t vc_size(const char *vendor, size_t num_tags, char **tags)
+{
+    size_t metadata_size = 4 + strlen(vendor) + 4;
+    for (size_t i = 0; i < num_tags; i++)
+        metadata_size += strlen(tags[i]) + 4;
+    return metadata_size;
+}
+
+int copy_remaining_pages(DB_FILE *in, FILE *out, ogg_sync_state *oy, const int codec_serial, uint32_t pageno)
+{
+    /* Skip past the codec header packets */
+    ogg_page og;
+    int serial;
+    do
+        serial = get_page(in, oy, &og);
+    while (serial > OGGEDIT_EOF && serial == codec_serial && ogg_page_granulepos(&og) <= 0);
+    if (serial <= OGGEDIT_EOF)
+        return serial;
+
+    /* Renumber the rest of this link */
+    while (serial > OGGEDIT_EOF && !ogg_page_bos(&og)) {
+        if (serial == codec_serial && ogg_page_pageno(&og) != ++pageno) {
+            og.header[18] = pageno & 0xFF;
+            og.header[19] = pageno >> 8 & 0xFF;
+            og.header[20] = pageno >> 16 & 0xFF;
+            og.header[21] = pageno >> 24 & 0xFF;
+            ogg_page_checksum_set(&og);
+        }
+        serial = write_page_and_get_next(in, out, oy,  &og);
+    }
+
+    /* Blindly copy remaining links */
+    while (serial > OGGEDIT_EOF)
+        serial = write_page_and_get_next(in, out, oy,  &og);
+    if (serial < OGGEDIT_EOF)
+        return serial;
+
+    return OGGEDIT_OK;
+}
+
+int write_all_streams(DB_FILE *in, FILE *out, ogg_sync_state *oy, const off_t offset)
+{
+    /* Copy BOS page(s) */
+    ogg_page og;
+    int serial = skip_to_bos(in, oy, &og, offset);
+    while (serial > OGGEDIT_EOF && ogg_page_bos(&og))
+        serial = write_page_and_get_next(in, out, oy, &og);
+    if (serial <= OGGEDIT_EOF)
+        return serial;
+
+    /* Copy all pages until EOF or next link */
+    while (serial > OGGEDIT_EOF && !ogg_page_bos(&og))
+        serial = write_page_and_get_next(in, out, oy, &og);
+    if (serial < OGGEDIT_EOF)
+        return serial;
+
+    return OGGEDIT_OK;
+}
+
+int write_one_stream(DB_FILE *in, FILE *out, ogg_sync_state *oy, const off_t offset, const char *codec)
+{
+    /* Find codec BOS page */
+    ogg_page og;
+    const int codec_serial = skip_to_codec(in, oy, &og, offset, codec);
+    if (codec_serial <= OGGEDIT_EOF)
+        return codec_serial;
+
+    /* Write it and skip the other BOS pages */
+    int serial = write_page_and_get_next(in, out, oy, &og);
+    if ((serial = skip_to_header(in, oy, &og, serial, codec_serial)) <= OGGEDIT_EOF)
+        return serial;
+
+    /* Copy all codec pages until EOF or next link */
+    while (serial > OGGEDIT_EOF && !ogg_page_bos(&og)) {
+        if (serial == codec_serial && !write_page(out, &og))
+            return OGGEDIT_WRITE_ERROR;
+        serial = get_page(in, oy, &og);
+    }
+    if (serial < OGGEDIT_EOF)
+        return serial;
+
+    return OGGEDIT_OK;
+}
diff --git a/plugins/liboggedit/oggedit_internal.h b/plugins/liboggedit/oggedit_internal.h
new file mode 100644
index 0000000..d050ac7
--- /dev/null
+++ b/plugins/liboggedit/oggedit_internal.h
@@ -0,0 +1,67 @@
+/*
+  This file is part of Deadbeef Player source code
+  http://deadbeef.sourceforge.net
+
+  DeaDBeeF Ogg Edit library internal headers
+
+  Copyright (C) 2014 Ian Nartowicz <deadbeef at nartowicz.co.uk>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+*/
+
+#ifndef __OGGEDIT_INT_H
+#define __OGGEDIT_INT_H
+
+#include <stdbool.h>
+#include <ogg/ogg.h>
+#if HAVE_SYS_SYSLIMITS_H
+#include <sys/syslimits.h>
+#endif
+#include "../../deadbeef.h"
+#include "oggedit.h"
+
+#define OPUSNAME "Opus"
+#define VORBISNAME "Vorbis"
+#define FLACNAME "Flac"
+
+#define CHUNKSIZE 4096
+#define MAXPAGE 65536
+#define MAXPAYLOAD 65025
+
+void _oggpack_chars(oggpack_buffer *opb, const char *s, size_t length);
+void _oggpack_string(oggpack_buffer *opb, const char *s);
+void _oggpackB_string(oggpack_buffer *opb, const char *s);
+int open_temp_file(const char *fname, char *tempname, FILE **out);
+FILE *open_new_file(const char *outname);
+off_t file_size(const char *fname);
+void cleanup(DB_FILE *in, FILE *out, ogg_sync_state *oy, void *buffer);
+int copy_up_to_codec(DB_FILE *in, FILE *out, ogg_sync_state *oy, ogg_page *og, const off_t start_offset, const off_t link_offset, const char *codec);
+int copy_up_to_header(DB_FILE *in, FILE *out, ogg_sync_state *oy, ogg_page *og, const int codec_serial);
+long flush_stream(FILE *out, ogg_stream_state *os);
+char *codec_names(DB_FILE *in, ogg_sync_state *oy, const off_t link_offset);
+off_t codec_stream_size(DB_FILE *in, ogg_sync_state *oy, const off_t start_offset, const off_t end_offset, const char *codec);
+char *parse_vendor(const ogg_packet *op, const size_t magic_length);
+int init_read_stream(DB_FILE *in, ogg_sync_state *oy, ogg_stream_state *os, ogg_page *og, const off_t offset, const char *codec);
+int read_packet(DB_FILE *in, ogg_sync_state *oy, ogg_stream_state *os, ogg_page *og, ogg_packet *header, int pages);
+ogg_packet *fill_vc_packet(const char *magic, const size_t magic_length, const char *vendor, const size_t num_tags, char **tags, const bool framing, const size_t padding, ogg_packet *op);
+size_t vc_size(const char *vendor, size_t num_tags, char **tags);
+int copy_remaining_pages(DB_FILE *in, FILE *out, ogg_sync_state *oy, const int codec_serial, uint32_t pageno);
+int write_all_streams(DB_FILE *in, FILE *out, ogg_sync_state *oy, const off_t offset);
+int write_one_stream(DB_FILE *in, FILE *out, ogg_sync_state *oy, const off_t offset, const char *codec);
+
+#endif /* __OGGEDIT_INT_H */
diff --git a/plugins/liboggedit/oggedit_opus.c b/plugins/liboggedit/oggedit_opus.c
new file mode 100644
index 0000000..21d7536
--- /dev/null
+++ b/plugins/liboggedit/oggedit_opus.c
@@ -0,0 +1,199 @@
+/*
+  This file is part of Deadbeef Player source code
+  http://deadbeef.sourceforge.net
+
+  DeaDBeeF Ogg Edit library Opus functions
+
+  Copyright (C) 2014 Ian Nartowicz <deadbeef at nartowicz.co.uk>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <limits.h>
+#include "oggedit_internal.h"
+
+#define TAGMAGIC "OpusTags"
+
+int oggedit_write_opus_file(DB_FILE *in, const char *outname, const off_t offset, const bool all_streams)
+{
+    FILE *out = open_new_file(outname);
+    if (!out)
+        return OGGEDIT_CANNOT_OPEN_OUTPUT_FILE;
+
+    ogg_sync_state oy;
+    ogg_sync_init(&oy);
+
+    int res;
+    if (all_streams)
+        res = write_one_stream(in, out, &oy, offset, OPUSNAME);
+    else
+        res = write_all_streams(in, out, &oy, offset);
+
+    cleanup(in, out, &oy, NULL);
+
+    if (res <= OGGEDIT_EOF)
+        unlink(outname);
+
+    return res;
+}
+
+off_t oggedit_opus_stream_info(DB_FILE *in, const off_t start_offset, const off_t end_offset, char **codecs)
+{
+    ogg_sync_state oy;
+    ogg_sync_init(&oy);
+    *codecs = codec_names(in, &oy, start_offset);
+    const off_t stream_size = codec_stream_size(in, &oy, start_offset, end_offset, OPUSNAME);
+    cleanup(in, NULL, &oy, NULL);
+    return stream_size;
+}
+
+static ptrdiff_t check_opus_header(DB_FILE *in, ogg_sync_state *oy, const off_t offset, char **vendor)
+{
+    ogg_stream_state os;
+    ogg_page og;
+    const int serial = init_read_stream(in, oy, &os, &og, offset, OPUSNAME);
+    if (serial <= OGGEDIT_EOF)
+        return serial;
+
+    ogg_packet op;
+    const int pages = read_packet(in, oy, &os, &og, &op, 1);
+    ogg_stream_clear(&os);
+    if (pages <= OGGEDIT_EOF)
+        return pages;
+
+    if (op.bytes > strlen(TAGMAGIC) && !memcmp(op.packet, TAGMAGIC, strlen(TAGMAGIC)))
+        *vendor = parse_vendor(&op, strlen(TAGMAGIC));
+    free(op.packet);
+    if (!*vendor)
+        return OGGEDIT_CANNOT_PARSE_HEADERS;
+
+#ifdef HAVE_OGG_STREAM_FLUSH_FILL
+    if (op.bytes < MAXPAYLOAD * (pages-1))
+        return 4; // prevent in-place write if the packet is weirdly split into too many pages
+#else
+    return 4; // not safe to pad without ogg_stream_flush_fill
+#endif
+
+    return op.bytes;
+}
+
+static long write_opus_tags(FILE *out, const int serial, const char *vendor, const size_t num_tags, char **tags, const size_t padding)
+{
+    ogg_packet op;
+    if (!fill_vc_packet(TAGMAGIC, strlen(TAGMAGIC), vendor, num_tags, tags, false, padding, &op))
+        return OGGEDIT_ALLOCATION_FAILURE;
+
+    ogg_stream_state os;
+    if (ogg_stream_init(&os, serial))
+        return OGGEDIT_FAILED_TO_INIT_STREAM;
+    os.b_o_s = 1;
+    os.pageno = 1;
+    ogg_stream_packetin(&os, &op);
+
+    ogg_packet_clear(&op);
+    return flush_stream(out, &os);
+}
+
+off_t oggedit_write_opus_metadata(DB_FILE *in, const char *fname, const off_t offset, const size_t stream_size, const int output_gain, const int num_tags, char **tags)
+{
+    off_t res;
+    char tempname[PATH_MAX] = "";
+    char *vendor = NULL;
+    ogg_sync_state oy;
+    ogg_sync_init(&oy);
+
+    /* Original file must be writable whichever way we update it */
+    FILE *out = fopen(fname, "r+b");
+    if (!out) {
+        res = OGGEDIT_CANNOT_UPDATE_FILE;
+        goto cleanup;
+    }
+
+    /* Should we write the tags packet directly into the existing file ... */
+    const ptrdiff_t tags_packet_size = check_opus_header(in, &oy, offset, &vendor);
+    if (tags_packet_size <= OGGEDIT_EOF) {
+        res = tags_packet_size;
+        goto cleanup;
+    }
+    const size_t metadata_size = strlen(TAGMAGIC) + vc_size(vendor, num_tags, tags);
+    ptrdiff_t padding = tags_packet_size - metadata_size;
+    const off_t file_size_k = in->vfs->getlength(in) / 1000;
+    const size_t stream_size_k = stream_size ? stream_size / 1000 : file_size_k;
+    if (file_size_k < 100 || padding < 0 || padding > file_size_k/10+stream_size_k+metadata_size) {
+        res = open_temp_file(fname, tempname, &out);
+        if (res) {
+            goto cleanup;
+        }
+    }
+
+    /* Re-pad if writing the whole file */
+    if (*tempname)
+        padding = stream_size_k < 90 ? 0 : stream_size_k < 1000 ? 128 : stream_size_k < 10000 ? 1024 : 8192;
+
+    /* Write pages until we reach the correct OpusHead, then write OpusTags */
+    ogg_page og;
+    const int opus_serial = copy_up_to_codec(in, out, &oy, &og, *tempname ? 0 : offset, offset, OPUSNAME);
+    if (opus_serial <= OGGEDIT_EOF) {
+        res = opus_serial;
+        goto cleanup;
+    }
+    if (output_gain > INT_MIN) {
+        og.body[16] = output_gain & 0xFF;
+        og.body[17] = output_gain >> 8 & 0xFF;
+        ogg_page_checksum_set(&og);
+    }
+    if ((res = copy_up_to_header(in, out, &oy, &og, opus_serial)) <= OGGEDIT_EOF)
+        goto cleanup;
+    const long pageno = write_opus_tags(out, opus_serial, vendor, num_tags, tags, (size_t)padding);
+    if (pageno < OGGEDIT_EOF) {
+        res = pageno;
+        goto cleanup;
+    }
+
+    /* If we have tempfile, copy the remaining pages */
+    if (*tempname) {
+        if ((res = copy_remaining_pages(in, out, &oy, opus_serial, pageno)) <= OGGEDIT_EOF)
+            goto cleanup;
+        if (rename(tempname, fname)) {
+            res = OGGEDIT_RENAME_FAILED;
+            goto cleanup;
+        }
+    }
+
+    res = file_size(fname);
+
+cleanup:
+    cleanup(in, out, &oy, vendor);
+    if (res < OGGEDIT_OK)
+        unlink(tempname);
+    return res;
+}
+/*
+struct timeval timeval;
+gettimeofday(&timeval, NULL);
+int usecs = timeval.tv_sec*1000000 + timeval.tv_usec;
+gettimeofday(&timeval, NULL);
+usecs = timeval.tv_sec*1000000 + timeval.tv_usec - usecs;
+fprintf(stderr, "%d micro-seconds\n", usecs);
+*/
diff --git a/plugins/liboggedit/oggedit_utils.c b/plugins/liboggedit/oggedit_utils.c
new file mode 100644
index 0000000..c47d90f
--- /dev/null
+++ b/plugins/liboggedit/oggedit_utils.c
@@ -0,0 +1,125 @@
+/*
+  This file is part of Deadbeef Player source code
+  http://deadbeef.sourceforge.net
+
+  DeaDBeeF Ogg Edit library miscellaneous functions
+
+  Copyright (C) 2014 Ian Nartowicz <deadbeef at nartowicz.co.uk>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <ctype.h>
+#include "oggedit_internal.h"
+
+uint8_t *oggedit_vorbis_channel_map(const int channel_count)
+{
+    size_t map_size = channel_count * sizeof(uint8_t);
+    uint8_t *map = malloc(map_size);
+    if (!map)
+        return NULL;
+    switch(channel_count) {
+        case 3:
+            return memcpy(map, &((uint8_t[]){0,2,1}), map_size);
+        case 5:
+            return memcpy(map, &((uint8_t[]){0,2,1,3,4}), map_size);
+        case 6:
+            return memcpy(map, &((uint8_t[]){0,2,1,4,5,3}), map_size);
+        case 7:
+            return memcpy(map, &((uint8_t[]){0,2,1,4,5,6,3}), map_size);
+        case 8:
+            return memcpy(map, &((uint8_t[]){0,2,1,6,7,4,5,3}), map_size);
+        default:
+            free(map);
+            return NULL;
+    }
+}
+
+const char *oggedit_map_tag(char *key, const char *in_or_out)
+{
+    typedef struct {
+        const char *tag;
+        const char *meta;
+    } key_t;
+    const key_t keys[] = {
+        /* Permanent named tags in DeaDBeef */
+//        {.tag = "ARTIST",         .meta = "artist"},
+//        {.tag = "TITLE",          .meta = "title"},
+//        {.tag = "ALBUM",          .meta = "album"},
+        {.tag = "DATE",           .meta = "year"},
+        {.tag = "TRACKNUMBER",    .meta = "track"},
+        {.tag = "TRACKTOTAL",     .meta = "numtracks"},
+//        {.tag = "GENRE",          .meta = "genre"},
+//        {.tag = "COMPOSER",       .meta = "composer"},
+        {.tag = "DISCNUMBER",     .meta = "disc"},
+//        {.tag = "COMMENT",        .meta = "comment"},
+        /* Vorbis standard tags */
+//        {.tag = "ARRANGER",       .meta = "Arranger"},
+//        {.tag = "AUTHOR",         .meta = "Author"},
+//        {.tag = "CONDUCTOR",      .meta = "Conductor"},
+//        {.tag = "ENSEMBLE",       .meta = "Ensemble"},
+//        {.tag = "LYRICIST",       .meta = "Lyricist"},
+//        {.tag = "PERFORMER",      .meta = "Performer"},
+//        {.tag = "PUBLISHER",      .meta = "Publisher"},
+//        {.tag = "DISCTOTAL",      .meta = "Disctotal"},
+//        {.tag = "OPUS",           .meta = "Opus"},
+//        {.tag = "PART",           .meta = "Part"},
+//        {.tag = "PARTNUMBER",     .meta = "Partnumber"},
+//        {.tag = "VERSION",        .meta = "Version"},
+//        {.tag = "DESCRIPTION",    .meta = "Description"},
+//        {.tag = "COPYRIGHT",      .meta = "Copyright"},
+//        {.tag = "LICENSE",        .meta = "License"},
+//        {.tag = "CONTACT",        .meta = "Contact"},
+//        {.tag = "ORGANIZATION",   .meta = "Organization"},
+//        {.tag = "LOCATION",       .meta = "Location"},
+//        {.tag = "EAN/UPN",        .meta = "EAN/UPN"},
+//        {.tag = "ISRC",           .meta = "ISRC"},
+//        {.tag = "LABEL",          .meta = "Label"},
+//        {.tag = "LABELNO",        .meta = "Labelno"},
+//        {.tag = "ENCODER",        .meta = "Encoder"},
+//        {.tag = "ENCODED-BY",     .meta = "Encoded-by"},
+//        {.tag = "ENCODING",       .meta = "Encoding"},
+        /* Other tags */
+//        {.tag = "ALBUMARTIST",    .meta = "Albumartist"},
+//        {.tag = "ALBUM ARTIST",   .meta = "Album artist"},
+//        {.tag = "BAND",           .meta = "Band"},
+//        {.tag = "COMPILATION",    .meta = "Compilation"},
+//        {.tag = "TOTALTRACKS",    .meta = "Totaltracks"},
+//        {.tag = "ENCODED_BY",     .meta = "Encoded_by"},
+//        {.tag = "ENCODER_OPTIONS",.meta = "Encoder_options"},
+        {.tag = NULL}
+    };
+
+    /* Mapping for special Deadbeef internal metadata */
+    for (const key_t *match = keys; match->tag; match++)
+        if (!strcasecmp(*in_or_out == 't' ? match->tag : match->meta, key))
+            return *in_or_out == 't' ? match->meta : match->tag;
+
+    /* Upper-case all Vorbis Comment tag names */
+    if (*in_or_out == 'm')
+        for (size_t i = 0; key[i]; i++)
+            key[i] = toupper(key[i]);
+
+    return key;
+}
diff --git a/plugins/liboggedit/oggedit_vorbis.c b/plugins/liboggedit/oggedit_vorbis.c
new file mode 100644
index 0000000..9d97b07
--- /dev/null
+++ b/plugins/liboggedit/oggedit_vorbis.c
@@ -0,0 +1,170 @@
+/*
+  This file is part of Deadbeef Player source code
+  http://deadbeef.sourceforge.net
+
+  DeaDBeeF Ogg Edit library Vorbis functions
+
+  Copyright (C) 2014 Ian Nartowicz <deadbeef at nartowicz.co.uk>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "oggedit_internal.h"
+
+#define VCMAGIC "\3vorbis"
+#define CODEMAGIC "\5vorbis"
+
+off_t oggedit_vorbis_stream_info(DB_FILE *in, const off_t start_offset, const off_t end_offset, char **codecs)
+{
+    ogg_sync_state oy;
+    ogg_sync_init(&oy);
+    *codecs = codec_names(in, &oy, start_offset);
+    const off_t stream_size = codec_stream_size(in, &oy, start_offset, end_offset, VORBISNAME);
+    cleanup(in, NULL, &oy, NULL);
+    return stream_size;
+}
+
+static ptrdiff_t check_vorbis_headers(DB_FILE *in, ogg_sync_state *oy, const off_t offset, char **vendor, ogg_packet *codebooks)
+{
+    ogg_stream_state os;
+    ogg_page og;
+    const int serial = init_read_stream(in, oy, &os, &og, offset, VORBISNAME);
+    if (serial <= OGGEDIT_EOF)
+        return serial;
+
+    ogg_packet vc;
+    int pages = read_packet(in, oy, &os, &og, &vc, 1);
+    if (pages > OGGEDIT_EOF)
+        pages = read_packet(in, oy, &os, &og, codebooks, pages);
+    ogg_stream_clear(&os);
+    if (pages <= OGGEDIT_EOF)
+        return pages;
+
+    if (vc.bytes > strlen(VCMAGIC) && !memcmp(vc.packet, VCMAGIC, strlen(VCMAGIC)) &&
+        codebooks->bytes > strlen(CODEMAGIC) && !memcmp(codebooks->packet, CODEMAGIC, strlen(CODEMAGIC)))
+        *vendor = parse_vendor(&vc, strlen(VCMAGIC));
+    free(vc.packet);
+    if (!*vendor)
+        return OGGEDIT_CANNOT_PARSE_HEADERS;
+
+#ifdef HAVE_OGG_STREAM_FLUSH_FILL
+    if ((vc.bytes + codebooks->bytes) < MAXPAYLOAD * (pages-1))
+        return 4; // prevent in-place write if the packets are split over too many pages
+#else
+    return 4; // not safe to pad without ogg_stream_flush_fill
+#endif
+
+    return vc.bytes;
+}
+
+static long write_vorbis_tags(FILE *out, const int serial, const char *vendor, const size_t num_tags, char **tags, const size_t padding, ogg_packet *codebooks)
+{
+    ogg_packet op;
+    if (!fill_vc_packet(VCMAGIC, strlen(VCMAGIC), vendor, num_tags, tags, true, padding, &op))
+        return OGGEDIT_ALLOCATION_FAILURE;
+
+    ogg_stream_state os;
+    if (ogg_stream_init(&os, serial))
+        return OGGEDIT_FAILED_TO_INIT_STREAM;
+    os.b_o_s = 1;
+    os.pageno = 1;
+    ogg_stream_packetin(&os, &op);
+    ogg_stream_packetin(&os, codebooks);
+
+    ogg_packet_clear(&op);
+    return flush_stream(out, &os);
+}
+
+off_t oggedit_write_vorbis_metadata(DB_FILE *in, const char *fname, const off_t offset, const size_t stream_size, const int num_tags, char **tags)
+{
+    off_t res;
+    char tempname[PATH_MAX] = "";
+    char *vendor = NULL;
+    ogg_packet codebooks;
+    memset(&codebooks, '\0', sizeof(codebooks));
+    ogg_sync_state oy;
+    ogg_sync_init(&oy);
+
+    /* Original file must be writable whichever way we update it */
+    FILE *out = fopen(fname, "r+b");
+    if (!out) {
+        res = OGGEDIT_CANNOT_UPDATE_FILE;
+        goto cleanup;
+    }
+
+    /* See if we can write the tags packet directly into the existing file ... */
+    const ptrdiff_t tags_packet_size = check_vorbis_headers(in, &oy, offset, &vendor, &codebooks);
+    if (tags_packet_size <= OGGEDIT_EOF) {
+        res = tags_packet_size;
+        goto cleanup;
+    }
+    const size_t metadata_size = strlen(VCMAGIC) + vc_size(vendor, num_tags, tags) + 1;
+    ptrdiff_t padding = tags_packet_size - metadata_size;
+    const off_t file_size_k = in->vfs->getlength(in) / 1000;
+    const size_t stream_size_k = stream_size ? stream_size / 1000 : file_size_k;
+    if (file_size_k < 100 || padding < 0 || padding > file_size_k/10+stream_size_k+metadata_size) {
+        res = open_temp_file(fname, tempname, &out);
+        if (res) {
+            goto cleanup;
+        }
+    }
+
+    /* Re-pad if writing the whole file */
+    if (*tempname)
+        padding = stream_size_k < 90 ? 0 : stream_size_k < 1000 ? 128 : stream_size_k < 10000 ? 1024 : 8192;
+
+    /* Write pages until the correct comment header */
+    ogg_page og;
+    const int vorbis_serial = copy_up_to_codec(in, out, &oy, &og, *tempname ? 0 : offset, offset, VORBISNAME);
+    if (vorbis_serial <= OGGEDIT_EOF) {
+        res = vorbis_serial;
+        goto cleanup;
+    }
+    if ((res = copy_up_to_header(in, out, &oy, &og, vorbis_serial)) <= OGGEDIT_EOF)
+        goto cleanup;
+    const long pageno = write_vorbis_tags(out, vorbis_serial, vendor, num_tags, tags, padding, &codebooks);
+    if (pageno < OGGEDIT_EOF) {
+        res = pageno;
+        goto cleanup;
+    }
+
+    /* If we have tempfile, copy the remaining pages */
+    if (*tempname) {
+        if ((res = copy_remaining_pages(in, out, &oy, vorbis_serial, pageno)) <= OGGEDIT_EOF)
+            goto cleanup;
+        if (rename(tempname, fname)) {
+            res = OGGEDIT_RENAME_FAILED;
+            goto cleanup;
+        }
+    }
+
+    res = file_size(fname);
+
+cleanup:
+    ogg_packet_clear(&codebooks);
+    cleanup(in, out, &oy, vendor);
+    if (res < OGGEDIT_OK)
+        unlink(tempname);
+    return res;
+}
diff --git a/plugins/libparser/COPYING b/plugins/libparser/COPYING
new file mode 100644
index 0000000..9764dda
--- /dev/null
+++ b/plugins/libparser/COPYING
@@ -0,0 +1,21 @@
+Simple text parsing library
+Copyright (C) 2009-2014 Alexey Yakovenko
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
diff --git a/plugins/libparser/Makefile.am b/plugins/libparser/Makefile.am
index 1009e8a..ce4319b 100644
--- a/plugins/libparser/Makefile.am
+++ b/plugins/libparser/Makefile.am
@@ -1,3 +1,3 @@
 noinst_LIBRARIES = libparser.a
 libparser_a_SOURCES = parser.c parser.h
-libparser_a_CFLAGS = -fPIC
+AM_CFLAGS = -fPIC
diff --git a/plugins/libparser/Makefile.in b/plugins/libparser/Makefile.in
index def7076..c2e3336 100644
--- a/plugins/libparser/Makefile.in
+++ b/plugins/libparser/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/libparser
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -82,23 +110,52 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
+AM_V_AR = $(am__v_AR_ at AM_V@)
+am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
 libparser_a_AR = $(AR) $(ARFLAGS)
 libparser_a_LIBADD =
-am_libparser_a_OBJECTS = libparser_a-parser.$(OBJEXT)
+am_libparser_a_OBJECTS = parser.$(OBJEXT)
 libparser_a_OBJECTS = $(am_libparser_a_OBJECTS)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libparser_a_SOURCES)
 DIST_SOURCES = $(libparser_a_SOURCES)
 am__can_run_installinfo = \
@@ -106,6 +163,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -132,6 +206,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -152,10 +227,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -178,6 +255,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -231,6 +309,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -249,6 +328,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -274,13 +355,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -289,7 +374,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -349,7 +436,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libparser.a
 libparser_a_SOURCES = parser.c parser.h
-libparser_a_CFLAGS = -fPIC
+AM_CFLAGS = -fPIC
 all: all-am
 
 .SUFFIXES:
@@ -387,10 +474,11 @@ $(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
 libparser.a: $(libparser_a_OBJECTS) $(libparser_a_DEPENDENCIES) $(EXTRA_libparser_a_DEPENDENCIES) 
-	-rm -f libparser.a
-	$(libparser_a_AR) libparser.a $(libparser_a_OBJECTS) $(libparser_a_LIBADD)
-	$(RANLIB) libparser.a
+	$(AM_V_at)-rm -f libparser.a
+	$(AM_V_AR)$(libparser_a_AR) libparser.a $(libparser_a_OBJECTS) $(libparser_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libparser.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -398,42 +486,28 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libparser_a-parser.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/parser.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-libparser_a-parser.o: parser.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libparser_a_CFLAGS) $(CFLAGS) -MT libparser_a-parser.o -MD -MP -MF $(DEPDIR)/libparser_a-parser.Tpo -c -o libparser_a-parser.o `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libparser_a-parser.Tpo $(DEPDIR)/libparser_a-parser.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parser.c' object='libparser_a-parser.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libparser_a_CFLAGS) $(CFLAGS) -c -o libparser_a-parser.o `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
-
-libparser_a-parser.obj: parser.c
- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libparser_a_CFLAGS) $(CFLAGS) -MT libparser_a-parser.obj -MD -MP -MF $(DEPDIR)/libparser_a-parser.Tpo -c -o libparser_a-parser.obj `if test -f 'parser.c'; then $(CYGPATH_W) 'parser.c'; else $(CYGPATH_W) '$(srcdir)/parser.c'; fi`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libparser_a-parser.Tpo $(DEPDIR)/libparser_a-parser.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parser.c' object='libparser_a-parser.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libparser_a_CFLAGS) $(CFLAGS) -c -o libparser_a-parser.obj `if test -f 'parser.c'; then $(CYGPATH_W) 'parser.c'; else $(CYGPATH_W) '$(srcdir)/parser.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -441,26 +515,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -472,15 +535,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -489,6 +548,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -630,18 +704,19 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/libparser/parser.c b/plugins/libparser/parser.c
index dfb5fa5..06d54f8 100644
--- a/plugins/libparser/parser.c
+++ b/plugins/libparser/parser.c
@@ -1,19 +1,24 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    Simple text parsing library
+    Copyright (C) 2009-2014 Alexey Yakovenko
 
-    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 software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
 
-    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.
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
 
 #include <stdlib.h>
diff --git a/plugins/libparser/parser.h b/plugins/libparser/parser.h
index 59a0255..b4af119 100644
--- a/plugins/libparser/parser.h
+++ b/plugins/libparser/parser.h
@@ -1,19 +1,24 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    Simple text parsing library
+    Copyright (C) 2009-2014 Alexey Yakovenko
 
-    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 software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
 
-    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.
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
 #ifndef __PARSER_H
 #define __PARSER_H
diff --git a/plugins/m3u/COPYING b/plugins/m3u/COPYING
new file mode 100644
index 0000000..b234745
--- /dev/null
+++ b/plugins/m3u/COPYING
@@ -0,0 +1,21 @@
+M3U and PLS playlist plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
diff --git a/plugins/m3u/Makefile.am b/plugins/m3u/Makefile.am
index fdb6152..122af59 100644
--- a/plugins/m3u/Makefile.am
+++ b/plugins/m3u/Makefile.am
@@ -3,7 +3,7 @@ pkglib_LTLIBRARIES = m3u.la
 
 m3u_la_SOURCES = m3u.c
 
-m3u_la_LDFLAGS = -module -lm
+m3u_la_LDFLAGS = -module -avoid-version -lm
 
 m3u_la_LIBADD = $(LIBADD)
 
diff --git a/plugins/m3u/Makefile.in b/plugins/m3u/Makefile.in
index 2c3383d..9ce647e 100644
--- a/plugins/m3u/Makefile.in
+++ b/plugins/m3u/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/m3u
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -113,23 +141,48 @@ m3u_la_DEPENDENCIES =
 am__m3u_la_SOURCES_DIST = m3u.c
 @HAVE_M3U_TRUE at am_m3u_la_OBJECTS = m3u_la-m3u.lo
 m3u_la_OBJECTS = $(am_m3u_la_OBJECTS)
-m3u_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(m3u_la_CFLAGS) $(CFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+m3u_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(m3u_la_CFLAGS) $(CFLAGS) \
 	$(m3u_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_M3U_TRUE at am_m3u_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(m3u_la_SOURCES)
 DIST_SOURCES = $(am__m3u_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -137,6 +190,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -163,6 +233,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -183,10 +254,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -209,6 +282,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -262,6 +336,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -280,6 +355,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -305,13 +382,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -320,7 +401,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -380,7 +463,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @HAVE_M3U_TRUE at pkglib_LTLIBRARIES = m3u.la
 @HAVE_M3U_TRUE at m3u_la_SOURCES = m3u.c
- at HAVE_M3U_TRUE@m3u_la_LDFLAGS = -module -lm
+ at HAVE_M3U_TRUE@m3u_la_LDFLAGS = -module -avoid-version -lm
 @HAVE_M3U_TRUE at m3u_la_LIBADD = $(LIBADD)
 @HAVE_M3U_TRUE at m3u_la_CFLAGS = $(CFLAGS) -std=c99
 all: all-am
@@ -417,6 +500,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -443,14 +527,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 m3u.la: $(m3u_la_OBJECTS) $(m3u_la_DEPENDENCIES) $(EXTRA_m3u_la_DEPENDENCIES) 
-	$(m3u_la_LINK) $(am_m3u_la_rpath) $(m3u_la_OBJECTS) $(m3u_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(m3u_la_LINK) $(am_m3u_la_rpath) $(m3u_la_OBJECTS) $(m3u_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -461,32 +548,32 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/m3u_la-m3u.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 m3u_la-m3u.lo: m3u.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(m3u_la_CFLAGS) $(CFLAGS) -MT m3u_la-m3u.lo -MD -MP -MF $(DEPDIR)/m3u_la-m3u.Tpo -c -o m3u_la-m3u.lo `test -f 'm3u.c' || echo '$(srcdir)/'`m3u.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/m3u_la-m3u.Tpo $(DEPDIR)/m3u_la-m3u.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='m3u.c' object='m3u_la-m3u.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(m3u_la_CFLAGS) $(CFLAGS) -MT m3u_la-m3u.lo -MD -MP -MF $(DEPDIR)/m3u_la-m3u.Tpo -c -o m3u_la-m3u.lo `test -f 'm3u.c' || echo '$(srcdir)/'`m3u.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/m3u_la-m3u.Tpo $(DEPDIR)/m3u_la-m3u.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='m3u.c' object='m3u_la-m3u.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(m3u_la_CFLAGS) $(CFLAGS) -c -o m3u_la-m3u.lo `test -f 'm3u.c' || echo '$(srcdir)/'`m3u.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(m3u_la_CFLAGS) $(CFLAGS) -c -o m3u_la-m3u.lo `test -f 'm3u.c' || echo '$(srcdir)/'`m3u.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -494,26 +581,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -525,15 +601,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -542,6 +614,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -686,19 +773,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/m3u/m3u.c b/plugins/m3u/m3u.c
index e874776..ff3320b 100644
--- a/plugins/m3u/m3u.c
+++ b/plugins/m3u/m3u.c
@@ -1,25 +1,36 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    M3U and PLS playlist plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko
 
-    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.
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
 
+#ifdef HAVE_CONFIG_H
+#  include "../../config.h"
+#endif
 #include <string.h>
 #include <stdlib.h>
 #include <math.h> // for ceil
+#if HAVE_SYS_SYSLIMITS_H
+#include <sys/syslimits.h>
+#endif
+
 #include "../../deadbeef.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
@@ -199,6 +210,9 @@ load_m3u (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pab
                     deadbeef->pl_add_meta (it, "artist", artist);
                 }
             }
+            // reset title/artist, to avoid them from being reused in the next track
+            memset (title, 0, sizeof (title));
+            memset (artist, 0, sizeof (artist));
         }
         else {
             int l = strlen (nm);
@@ -212,9 +226,6 @@ load_m3u (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pab
             after = it;
         }
         if (pabort && *pabort) {
-            if (after) {
-                deadbeef->pl_item_ref (after);
-            }
             free (membuffer);
             return after;
         }
@@ -223,9 +234,6 @@ load_m3u (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pab
             break;
         }
     }
-    if (after) {
-        deadbeef->pl_item_ref (after);
-    }
     trace ("leave pl_insert_m3u\n");
     free (membuffer);
     return after;
@@ -234,18 +242,24 @@ load_m3u (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pab
 static DB_playItem_t *
 pls_insert_file (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, const char *uri, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data, const char *title, const char *length) {
     trace ("pls_insert_file uri: %s\n", uri);
+    trace ("pls_insert_file fname: %s\n", fname);
     DB_playItem_t *it = NULL;
     const char *slash = NULL;
 
     if (strrchr (uri, '/')) {
+        trace ("pls: inserting from uri: %s\n", uri);
         it = deadbeef->plt_insert_file2 (0, plt, after, uri, pabort, cb, user_data);
     }
-    else if (slash = strrchr (fname, '/')) {
+
+    if (!it) {
+        slash = strrchr (fname, '/');
+    }
+    if (slash) {
         int l = strlen (uri);
         char fullpath[slash - fname + l + 2];
         memcpy (fullpath, fname, slash - fname + 1);
         strcpy (fullpath + (slash - fname + 1), uri);
-        trace ("pls_insert_file: adding file %s\n", fullpath);
+        trace ("pls: inserting from calculated relative path: %s\n", fullpath);
         it = deadbeef->plt_insert_file2 (0, plt, after, fullpath, pabort, cb, user_data);
     }
     if (it) {
@@ -261,6 +275,7 @@ pls_insert_file (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, c
 
 static DB_playItem_t *
 load_pls (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data) {
+    trace ("load_pls %s\n", fname);
     const char *slash = strrchr (fname, '/');
     DB_FILE *fp = deadbeef->fopen (fname);
     if (!fp) {
@@ -307,24 +322,14 @@ load_pls (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pab
         }
         const uint8_t *e;
         int n;
-        if (!strncasecmp (p, "numberofentries=", 16) || !strncasecmp (p, "version=", 8)) {
-            while (p < end && *p >= 0x20) {
-                p++;
-            }
-            continue;
-        }
-        else if (!strncasecmp (p, "file", 4)) {
+        if (!strncasecmp (p, "file", 4)) {
             int idx = atoi (p + 4);
             if (uri[0] && idx != lastidx && lastidx != -1) {
-                trace ("uri%d\n", idx);
                 DB_playItem_t *it = pls_insert_file (plt, after, fname, uri, pabort, cb, user_data, title, length);
                 if (it) {
                     after = it;
                 }
                 if (pabort && *pabort) {
-                    if (after) {
-                        deadbeef->pl_item_ref (after);
-                    }
                     free (buffer);
                     return after;
                 }
@@ -338,6 +343,9 @@ load_pls (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pab
                 p++;
             }
             p++;
+            while (p < end && *p <= 0x20) {
+                p++;
+            }
             if (p >= end) {
                 break;
             }
@@ -362,9 +370,6 @@ load_pls (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pab
                     after = it;
                 }
                 if (pabort && *pabort) {
-                    if (after) {
-                        deadbeef->pl_item_ref (after);
-                    }
                     free (buffer);
                     return after;
                 }
@@ -378,6 +383,9 @@ load_pls (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pab
                 p++;
             }
             p++;
+            while (p < end && *p <= 0x20) {
+                p++;
+            }
             if (p >= end) {
                 break;
             }
@@ -401,9 +409,6 @@ load_pls (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pab
                     after = it;
                 }
                 if (pabort && *pabort) {
-                    if (after) {
-                        deadbeef->pl_item_ref (after);
-                    }
                     free (buffer);
                     return after;
                 }
@@ -431,8 +436,11 @@ load_pls (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pab
             trace ("length%d=%s\n", idx, length);
         }
         else {
-            trace ("invalid entry in pls file: %s\n", p);
-            break;
+            trace ("pls: skipping unrecognized entry in pls file: %s\n", p);
+            e = p;
+            while (e < end && *e >= 0x20) {
+                e++;
+            }
         }
         while (e < end && *e < 0x20) {
             e++;
@@ -445,15 +453,18 @@ load_pls (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pab
             after = it;
         }
     }
-    if (after) {
-        deadbeef->pl_item_ref (after);
-    }
     free (buffer);
     return after;
 }
 
 static DB_playItem_t *
 m3uplug_load (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data) {
+    char resolved_fname[PATH_MAX];
+    char *res = realpath (fname, resolved_fname);
+    if (res) {
+        fname = resolved_fname;
+    }
+
     const char *ext = strrchr (fname, '.');
     if (ext) {
         ext++;
@@ -615,21 +626,26 @@ DB_playlist_t plugin = {
     .plugin.name = "M3U and PLS support",
     .plugin.descr = "Importing and exporting M3U and PLS formats\nRecognizes .pls, .m3u and .m3u8 file types\n\nNOTE: only utf8 file names are currently supported",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "M3U and PLS playlist plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+        "\n"
+        "This software is provided 'as-is', without any express or implied\n"
+        "warranty.  In no event will the authors be held liable for any damages\n"
+        "arising from the use of this software.\n"
+        "\n"
+        "Permission is granted to anyone to use this software for any purpose,\n"
+        "including commercial applications, and to alter it and redistribute it\n"
+        "freely, subject to the following restrictions:\n"
         "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "1. The origin of this software must not be misrepresented; you must not\n"
+        " claim that you wrote the original software. If you use this software\n"
+        " in a product, an acknowledgment in the product documentation would be\n"
+        " appreciated but is not required.\n"
         "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
+        "2. Altered source versions must be plainly marked as such, and must not be\n"
+        " misrepresented as being the original software.\n"
         "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "3. This notice may not be removed or altered from any source distribution.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .load = m3uplug_load,
diff --git a/plugins/mms/COPYING b/plugins/mms/COPYING
new file mode 100644
index 0000000..e648d9e
--- /dev/null
+++ b/plugins/mms/COPYING
@@ -0,0 +1,40 @@
+MMS transport VFS plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+libmms - MMS over TCP protocol
+Copyright (C) 2002-2004 the xine project
+Modifications for DeaDBeeF (C) 2009-2014 Alexey Yakovenko
+
+xine is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the ree Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+xine 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
diff --git a/plugins/mms/Makefile.am b/plugins/mms/Makefile.am
index f16f741..89eb922 100644
--- a/plugins/mms/Makefile.am
+++ b/plugins/mms/Makefile.am
@@ -15,7 +15,7 @@ mms_la_SOURCES = mmsplug.c\
 	libmms/mmsx.h\
 	libmms/uri.h
 
-mms_la_LDFLAGS = -module
+mms_la_LDFLAGS = -module -avoid-version
 
 mms_la_LIBADD = $(LDADD) $(LIBMMS_LIBS)
 AM_CFLAGS = $(CFLAGS) -std=c99
diff --git a/plugins/mms/Makefile.in b/plugins/mms/Makefile.in
index 087b760..51251aa 100644
--- a/plugins/mms/Makefile.in
+++ b/plugins/mms/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/mms
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -118,23 +146,48 @@ am__mms_la_SOURCES_DIST = mmsplug.c libmms/mms.c libmms/mmsh.c \
 @HAVE_MMS_TRUE at am_mms_la_OBJECTS = mmsplug.lo mms.lo mmsh.lo mmsx.lo \
 @HAVE_MMS_TRUE@	uri.lo
 mms_la_OBJECTS = $(am_mms_la_OBJECTS)
-mms_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(mms_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+mms_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(mms_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_MMS_TRUE at am_mms_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(mms_la_SOURCES)
 DIST_SOURCES = $(am__mms_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -142,6 +195,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -168,6 +238,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -188,10 +259,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -214,6 +287,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -267,6 +341,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -285,6 +360,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -310,13 +387,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -325,7 +406,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -399,7 +482,7 @@ top_srcdir = @top_srcdir@
 @HAVE_MMS_TRUE@	libmms/mmsx.h\
 @HAVE_MMS_TRUE@	libmms/uri.h
 
- at HAVE_MMS_TRUE@mms_la_LDFLAGS = -module
+ at HAVE_MMS_TRUE@mms_la_LDFLAGS = -module -avoid-version
 @HAVE_MMS_TRUE at mms_la_LIBADD = $(LDADD) $(LIBMMS_LIBS)
 @HAVE_MMS_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
 all: all-am
@@ -436,6 +519,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -462,14 +546,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 mms.la: $(mms_la_OBJECTS) $(mms_la_DEPENDENCIES) $(EXTRA_mms_la_DEPENDENCIES) 
-	$(mms_la_LINK) $(am_mms_la_rpath) $(mms_la_OBJECTS) $(mms_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(mms_la_LINK) $(am_mms_la_rpath) $(mms_la_OBJECTS) $(mms_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -484,53 +571,53 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uri.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mms.lo: libmms/mms.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mms.lo -MD -MP -MF $(DEPDIR)/mms.Tpo -c -o mms.lo `test -f 'libmms/mms.c' || echo '$(srcdir)/'`libmms/mms.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mms.Tpo $(DEPDIR)/mms.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libmms/mms.c' object='mms.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mms.lo -MD -MP -MF $(DEPDIR)/mms.Tpo -c -o mms.lo `test -f 'libmms/mms.c' || echo '$(srcdir)/'`libmms/mms.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mms.Tpo $(DEPDIR)/mms.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libmms/mms.c' object='mms.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mms.lo `test -f 'libmms/mms.c' || echo '$(srcdir)/'`libmms/mms.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mms.lo `test -f 'libmms/mms.c' || echo '$(srcdir)/'`libmms/mms.c
 
 mmsh.lo: libmms/mmsh.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmsh.lo -MD -MP -MF $(DEPDIR)/mmsh.Tpo -c -o mmsh.lo `test -f 'libmms/mmsh.c' || echo '$(srcdir)/'`libmms/mmsh.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mmsh.Tpo $(DEPDIR)/mmsh.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libmms/mmsh.c' object='mmsh.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmsh.lo -MD -MP -MF $(DEPDIR)/mmsh.Tpo -c -o mmsh.lo `test -f 'libmms/mmsh.c' || echo '$(srcdir)/'`libmms/mmsh.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mmsh.Tpo $(DEPDIR)/mmsh.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libmms/mmsh.c' object='mmsh.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmsh.lo `test -f 'libmms/mmsh.c' || echo '$(srcdir)/'`libmms/mmsh.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmsh.lo `test -f 'libmms/mmsh.c' || echo '$(srcdir)/'`libmms/mmsh.c
 
 mmsx.lo: libmms/mmsx.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmsx.lo -MD -MP -MF $(DEPDIR)/mmsx.Tpo -c -o mmsx.lo `test -f 'libmms/mmsx.c' || echo '$(srcdir)/'`libmms/mmsx.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mmsx.Tpo $(DEPDIR)/mmsx.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libmms/mmsx.c' object='mmsx.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmsx.lo -MD -MP -MF $(DEPDIR)/mmsx.Tpo -c -o mmsx.lo `test -f 'libmms/mmsx.c' || echo '$(srcdir)/'`libmms/mmsx.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mmsx.Tpo $(DEPDIR)/mmsx.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libmms/mmsx.c' object='mmsx.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmsx.lo `test -f 'libmms/mmsx.c' || echo '$(srcdir)/'`libmms/mmsx.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmsx.lo `test -f 'libmms/mmsx.c' || echo '$(srcdir)/'`libmms/mmsx.c
 
 uri.lo: libmms/uri.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uri.lo -MD -MP -MF $(DEPDIR)/uri.Tpo -c -o uri.lo `test -f 'libmms/uri.c' || echo '$(srcdir)/'`libmms/uri.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/uri.Tpo $(DEPDIR)/uri.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libmms/uri.c' object='uri.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uri.lo -MD -MP -MF $(DEPDIR)/uri.Tpo -c -o uri.lo `test -f 'libmms/uri.c' || echo '$(srcdir)/'`libmms/uri.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/uri.Tpo $(DEPDIR)/uri.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libmms/uri.c' object='uri.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uri.lo `test -f 'libmms/uri.c' || echo '$(srcdir)/'`libmms/uri.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uri.lo `test -f 'libmms/uri.c' || echo '$(srcdir)/'`libmms/uri.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -538,26 +625,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -569,15 +645,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -586,6 +658,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -730,19 +817,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/mms/libmms/mms.c b/plugins/mms/libmms/mms.c
index 3aef102..b23130f 100644
--- a/plugins/mms/libmms/mms.c
+++ b/plugins/mms/libmms/mms.c
@@ -275,7 +275,11 @@ static int fallback_io_tcp_connect(void *data, const char *host, int port, int *
   for (rp = res; rp != NULL; rp = rp->ai_next) {
     struct sockaddr_in sin;
     memset (&sin, 0, sizeof (sin));
-    memcpy (&sin, rp->ai_addr, rp->ai_addrlen);
+    int l = rp->ai_addrlen;
+    if (l > sizeof (sin)) {
+        l = sizeof (sin);
+    }
+    memcpy (&sin, rp->ai_addr, l);
 #endif
     
     time_t t = time (NULL);
diff --git a/plugins/mms/mmsplug.c b/plugins/mms/mmsplug.c
index 5d87250..da07dc2 100644
--- a/plugins/mms/mmsplug.c
+++ b/plugins/mms/mmsplug.c
@@ -1,21 +1,26 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+    MMS transport VFS plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
+
 #include "../../deadbeef.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -173,23 +178,48 @@ static DB_vfs_t plugin = {
     .plugin.name = "mms vfs",
     .plugin.descr = "MMS streaming plugin based on libmms",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "MMS transport VFS plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+        "\n"
+        "Uses modified libmms-0.6.1\n"
+        "\n"
+        "This software is provided 'as-is', without any express or implied\n"
+        "warranty.  In no event will the authors be held liable for any damages\n"
+        "arising from the use of this software.\n"
+        "\n"
+        "Permission is granted to anyone to use this software for any purpose,\n"
+        "including commercial applications, and to alter it and redistribute it\n"
+        "freely, subject to the following restrictions:\n"
+        "\n"
+        "1. The origin of this software must not be misrepresented; you must not\n"
+        " claim that you wrote the original software. If you use this software\n"
+        " in a product, an acknowledgment in the product documentation would be\n"
+        " appreciated but is not required.\n"
+        "\n"
+        "2. Altered source versions must be plainly marked as such, and must not be\n"
+        " misrepresented as being the original software.\n"
+        "\n"
+        "3. This notice may not be removed or altered from any source distribution.\n"
+        "\n"
+        "\n"
         "\n"
-        "Uses modified libmms-0.6.0, http://sourceforge.net/projects/libmms/\n"
+        "libmms - MMS over TCP protocol\n"
+        "Copyright (C) 2002-2004 the xine project\n"
+        "Modifications for DeaDBeeF (C) 2009-2014 Alexey Yakovenko\n"
         "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "xine is free software; you can redistribute it and/or modify\n"
+        "it under the terms of the GNU General Public License as published by\n"
+        "the ree Software Foundation; either version 2 of the License, or\n"
+        "(at your option) any later version.\n"
         "\n"
-        "This program is distributed in the hope that it will be useful,\n"
+        "xine is distributed in the hope that it will be useful,\n"
         "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
         "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
         "GNU General Public License for more details.\n"
         "\n"
         "You should have received a copy of the GNU General Public License\n"
         "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .open = mms_open,
diff --git a/plugins/mono2stereo/COPYING b/plugins/mono2stereo/COPYING
new file mode 100644
index 0000000..194a627
--- /dev/null
+++ b/plugins/mono2stereo/COPYING
@@ -0,0 +1,21 @@
+Mono to stereo converter DSP plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
diff --git a/plugins/mono2stereo/Makefile.am b/plugins/mono2stereo/Makefile.am
index ccbbf84..d998e80 100644
--- a/plugins/mono2stereo/Makefile.am
+++ b/plugins/mono2stereo/Makefile.am
@@ -1,7 +1,7 @@
 if HAVE_MONO2STEREO
 pkglib_LTLIBRARIES = ddb_mono2stereo.la
 ddb_mono2stereo_la_SOURCES = mono2stereo.c
-ddb_mono2stereo_la_LDFLAGS = -module
+ddb_mono2stereo_la_LDFLAGS = -module -avoid-version
 
 ddb_mono2stereo_la_LIBADD = $(LDADD)
 AM_CFLAGS = $(CFLAGS) -std=c99
diff --git a/plugins/mono2stereo/Makefile.in b/plugins/mono2stereo/Makefile.in
index 3caf966..d8aad8e 100644
--- a/plugins/mono2stereo/Makefile.in
+++ b/plugins/mono2stereo/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/mono2stereo
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -113,24 +141,50 @@ ddb_mono2stereo_la_DEPENDENCIES =
 am__ddb_mono2stereo_la_SOURCES_DIST = mono2stereo.c
 @HAVE_MONO2STEREO_TRUE at am_ddb_mono2stereo_la_OBJECTS = mono2stereo.lo
 ddb_mono2stereo_la_OBJECTS = $(am_ddb_mono2stereo_la_OBJECTS)
-ddb_mono2stereo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(ddb_mono2stereo_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+ddb_mono2stereo_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(ddb_mono2stereo_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
 @HAVE_MONO2STEREO_TRUE at am_ddb_mono2stereo_la_rpath = -rpath \
 @HAVE_MONO2STEREO_TRUE@	$(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(ddb_mono2stereo_la_SOURCES)
 DIST_SOURCES = $(am__ddb_mono2stereo_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,6 +192,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,6 +235,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -184,10 +256,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -210,6 +284,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -263,6 +338,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -281,6 +357,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -306,13 +384,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -321,7 +403,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -381,7 +465,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @HAVE_MONO2STEREO_TRUE at pkglib_LTLIBRARIES = ddb_mono2stereo.la
 @HAVE_MONO2STEREO_TRUE at ddb_mono2stereo_la_SOURCES = mono2stereo.c
- at HAVE_MONO2STEREO_TRUE@ddb_mono2stereo_la_LDFLAGS = -module
+ at HAVE_MONO2STEREO_TRUE@ddb_mono2stereo_la_LDFLAGS = -module -avoid-version
 @HAVE_MONO2STEREO_TRUE at ddb_mono2stereo_la_LIBADD = $(LDADD)
 @HAVE_MONO2STEREO_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
 all: all-am
@@ -418,6 +502,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -444,14 +529,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 ddb_mono2stereo.la: $(ddb_mono2stereo_la_OBJECTS) $(ddb_mono2stereo_la_DEPENDENCIES) $(EXTRA_ddb_mono2stereo_la_DEPENDENCIES) 
-	$(ddb_mono2stereo_la_LINK) $(am_ddb_mono2stereo_la_rpath) $(ddb_mono2stereo_la_OBJECTS) $(ddb_mono2stereo_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(ddb_mono2stereo_la_LINK) $(am_ddb_mono2stereo_la_rpath) $(ddb_mono2stereo_la_OBJECTS) $(ddb_mono2stereo_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -462,25 +550,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mono2stereo.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -488,26 +576,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -519,15 +596,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -536,6 +609,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -680,19 +768,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/mono2stereo/mono2stereo.c b/plugins/mono2stereo/mono2stereo.c
index 18bcc07..9a259fa 100644
--- a/plugins/mono2stereo/mono2stereo.c
+++ b/plugins/mono2stereo/mono2stereo.c
@@ -1,21 +1,26 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+    Mono to stereo converter DSP plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
+
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
@@ -142,23 +147,28 @@ static DB_dsp_t plugin = {
     .plugin.type = DB_PLUGIN_DSP,
     .plugin.id = "m2s",
     .plugin.name = "Mono to stereo",
-    .plugin.descr = "DSP plugin to convert mono to stereo",
+    .plugin.descr = "Mono to stereo converter DSP",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "Mono to stereo converter DSP plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+        "\n"
+        "This software is provided 'as-is', without any express or implied\n"
+        "warranty.  In no event will the authors be held liable for any damages\n"
+        "arising from the use of this software.\n"
+        "\n"
+        "Permission is granted to anyone to use this software for any purpose,\n"
+        "including commercial applications, and to alter it and redistribute it\n"
+        "freely, subject to the following restrictions:\n"
         "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "1. The origin of this software must not be misrepresented; you must not\n"
+        " claim that you wrote the original software. If you use this software\n"
+        " in a product, an acknowledgment in the product documentation would be\n"
+        " appreciated but is not required.\n"
         "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
+        "2. Altered source versions must be plainly marked as such, and must not be\n"
+        " misrepresented as being the original software.\n"
         "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "3. This notice may not be removed or altered from any source distribution.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .num_params = m2s_num_params,
diff --git a/plugins/mpgmad/COPYING b/plugins/mpgmad/COPYING
new file mode 100644
index 0000000..9908700
--- /dev/null
+++ b/plugins/mpgmad/COPYING
@@ -0,0 +1,40 @@
+MPEG decoder plugin based on libmad
+Copyright (C) 2009-2014 Alexey Yakovenko
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+libmad - MPEG audio decoder library
+Copyright (C) 2000-2004 Underbit Technologies, Inc.
+
+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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
diff --git a/plugins/mpgmad/Makefile.am b/plugins/mpgmad/Makefile.am
index 4cd3b67..a4ae3ac 100644
--- a/plugins/mpgmad/Makefile.am
+++ b/plugins/mpgmad/Makefile.am
@@ -2,8 +2,8 @@ if HAVE_MPGMAD
 mpgmaddir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = mpgmad.la
 mpgmad_la_SOURCES = mpgmad.c
-mpgmad_la_LDFLAGS = -module
+mpgmad_la_LDFLAGS = -module -avoid-version
 
 mpgmad_la_LIBADD = $(LDADD) $(MAD_LIBS)
-AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
+AM_CFLAGS = $(CFLAGS) $(MAD_CFLAGS) -std=c99 -fPIC
 endif
diff --git a/plugins/mpgmad/Makefile.in b/plugins/mpgmad/Makefile.in
index 1971d66..ab5ae73 100644
--- a/plugins/mpgmad/Makefile.in
+++ b/plugins/mpgmad/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/mpgmad
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -114,23 +142,48 @@ am__DEPENDENCIES_1 =
 am__mpgmad_la_SOURCES_DIST = mpgmad.c
 @HAVE_MPGMAD_TRUE at am_mpgmad_la_OBJECTS = mpgmad.lo
 mpgmad_la_OBJECTS = $(am_mpgmad_la_OBJECTS)
-mpgmad_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+mpgmad_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(mpgmad_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_MPGMAD_TRUE at am_mpgmad_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(mpgmad_la_SOURCES)
 DIST_SOURCES = $(am__mpgmad_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,6 +191,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,6 +234,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -184,10 +255,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -210,6 +283,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -263,6 +337,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -281,6 +356,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -306,13 +383,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -321,7 +402,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -382,9 +465,9 @@ top_srcdir = @top_srcdir@
 @HAVE_MPGMAD_TRUE at mpgmaddir = $(libdir)/$(PACKAGE)
 @HAVE_MPGMAD_TRUE at pkglib_LTLIBRARIES = mpgmad.la
 @HAVE_MPGMAD_TRUE at mpgmad_la_SOURCES = mpgmad.c
- at HAVE_MPGMAD_TRUE@mpgmad_la_LDFLAGS = -module
+ at HAVE_MPGMAD_TRUE@mpgmad_la_LDFLAGS = -module -avoid-version
 @HAVE_MPGMAD_TRUE at mpgmad_la_LIBADD = $(LDADD) $(MAD_LIBS)
- at HAVE_MPGMAD_TRUE@AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
+ at HAVE_MPGMAD_TRUE@AM_CFLAGS = $(CFLAGS) $(MAD_CFLAGS) -std=c99 -fPIC
 all: all-am
 
 .SUFFIXES:
@@ -419,6 +502,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -445,14 +529,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 mpgmad.la: $(mpgmad_la_OBJECTS) $(mpgmad_la_DEPENDENCIES) $(EXTRA_mpgmad_la_DEPENDENCIES) 
-	$(mpgmad_la_LINK) $(am_mpgmad_la_rpath) $(mpgmad_la_OBJECTS) $(mpgmad_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(mpgmad_la_LINK) $(am_mpgmad_la_rpath) $(mpgmad_la_OBJECTS) $(mpgmad_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -463,25 +550,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mpgmad.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,26 +576,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +596,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +609,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -681,19 +768,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/mpgmad/mpgmad.c b/plugins/mpgmad/mpgmad.c
index b3b83d9..1f78a0a 100644
--- a/plugins/mpgmad/mpgmad.c
+++ b/plugins/mpgmad/mpgmad.c
@@ -1,20 +1,27 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    MPEG decoder plugin based on libmad
+    Copyright (C) 2009-2014 Alexey Yakovenko
 
-    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 software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
 
-    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.
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
+
+
 #include <string.h>
 #include <stdio.h>
 #include <mad.h>
@@ -91,8 +98,8 @@ typedef struct {
 
     int skipsamples;
 
-    int startoffset; // in bytes (id3v2, xing/lame)
-    int endoffset; // in bytes (apev2, id3v1)
+    int64_t startoffset; // in bytes (id3v2, xing/lame)
+    int64_t endoffset; // in bytes (apev2, id3v1)
 
     // startsample and endsample exclude delay/padding
     int startsample;
@@ -190,8 +197,6 @@ static int
 cmp3_scan_stream (buffer_t *buffer, int sample) {
     trace ("cmp3_scan_stream %d (offs: %lld)\n", sample, deadbeef->ftell (buffer->file));
 
-    int have_info = 0;
-
 // {{{ prepare for scan - seek, reset averages, etc
     int initpos = deadbeef->ftell (buffer->file);
     trace ("initpos: %d\n", initpos);
@@ -200,19 +205,14 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
     int scansamples = 0;
     buffer->currentsample = 0;
     buffer->skipsamples = 0;
+//    int avg_bitrate = 0;
     int valid_frames = 0;
     int prev_bitrate = -1;
+    buffer->samplerate = 0;
     int64_t fsize = deadbeef->fgetlength (buffer->file);
 
     if (sample <= 0) {
         buffer->totalsamples = 0;
-        if (fsize > 0) {
-            fsize -= initpos;
-            if (fsize < 0) {
-                trace ("cmp3_scan_stream: invalid file: bad header\n");
-                return -1;
-            }
-        }
     }
     if (sample <= 0 && buffer->avg_packetlength == 0) {
         buffer->avg_packetlength = 0;
@@ -237,9 +237,12 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
     }
 
     for (;;) {
+        uint32_t hdr;
+        uint8_t sync;
 // {{{ parse frame header, sync stream
-        // mp3 files often have some garbage in the beginning
-        // try to skip it if this is the case
+        if (!lastframe_valid && offs >= 0) {
+            deadbeef->fseek (buffer->file, offs+1, SEEK_SET);
+        }
         offs = deadbeef->ftell (buffer->file);
         //uint8_t fb[4+2+2]; // 4b frame header + 2b crc + 2b sideinfo main_data_begin
         uint8_t fb[4]; // just the header
@@ -247,20 +250,31 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
             break; // eof
         }
 
-        uint32_t hdr;
-        uint8_t sync = fb[0];
+retry_sync:
+
+        sync = fb[0];
         if (sync != 0xff) {
-            lastframe_valid = 0;
 //            trace ("[1]frame %d didn't seek to frame end\n", nframe);
-            continue; // not an mpeg frame
+            lastframe_valid = 0;
+            memmove (fb, fb+1, 3);
+            if (deadbeef->fread (fb+3, 1, 1, buffer->file) != 1) {
+                break; // eof
+            }
+            offs++;
+            goto retry_sync; // not an mpeg frame
         }
         else {
             // 2nd sync byte
             sync = fb[1];
             if ((sync >> 5) != 7) {
-                lastframe_valid = 0;
 //                trace ("[2]frame %d didn't seek to frame end\n", nframe);
-                continue;
+                lastframe_valid = 0;
+                memmove (fb, fb+1, 3);
+                if (deadbeef->fread (fb+3, 1, 1, buffer->file) != 1) {
+                    break; // eof
+                }
+                offs++;
+                goto retry_sync; // not an mpeg frame
             }
         }
         // found frame
@@ -283,8 +297,8 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
         int ver = (hdr & (3<<19)) >> 19;
         ver = vertbl[ver];
         if (ver < 0) {
-            lastframe_valid = 0;
             trace ("frame %d bad mpeg version %d\n", nframe, (hdr & (3<<19)) >> 19);
+            lastframe_valid = 0;
             continue; // invalid frame
         }
 
@@ -293,8 +307,8 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
         int layer = (hdr & (3<<17)) >> 17;
         layer = ltbl[layer];
         if (layer < 0) {
-            lastframe_valid = 0;
             trace ("frame %d bad layer %d\n", nframe, (hdr & (3<<17)) >> 17);
+            lastframe_valid = 0;
             continue; // invalid frame
         }
 
@@ -319,8 +333,8 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
         }
         bitrate = brtable[idx][bitrate];
         if (bitrate <= 0) {
-            lastframe_valid = 0;
             trace ("frame %d bad bitrate %d\n", nframe, (hdr & (0x0f<<12)) >> 12);
+            lastframe_valid = 0;
             continue; // invalid frame
         }
 
@@ -333,8 +347,8 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
         int samplerate = (hdr & (0x03<<10))>>10;
         samplerate = srtable[ver-1][samplerate];
         if (samplerate < 0) {
-            lastframe_valid = 0;
             trace ("frame %d bad samplerate %d\n", nframe, (hdr & (0x03<<10))>>10);
+            lastframe_valid = 0;
             continue; // invalid frame
         }
 
@@ -348,13 +362,13 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
         // check if channel/bitrate combination is valid for layer2
         if (layer == 2) {
             if ((bitrate <= 56 || bitrate == 80) && nchannels != 1) {
-                lastframe_valid = 0;
                 trace ("mpgmad: bad frame %d: layer %d, channels %d, bitrate %d\n", nframe, layer, nchannels, bitrate);
+                lastframe_valid = 0;
                 continue; // bad frame
             }
             if (bitrate >= 224 && nchannels == 1) {
-                lastframe_valid = 0;
                 trace ("mpgmad: bad frame %d: layer %d, channels %d, bitrate %d\n", nframe, layer, nchannels, bitrate);
+                lastframe_valid = 0;
                 continue; // bad frame
             }
         }
@@ -389,13 +403,13 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
                 }
             }
             packetlength = samples_per_frame / 8 * bitrate / samplerate + padding;
-            if (sample > 0) {
-                trace ("frame: %d, layer: %d, bitrate: %d, samplerate: %d\n", nframe, layer, bitrate, samplerate);
-            }
+//            if (sample > 0) {
+//                printf ("frame: %d, crc: %d, layer: %d, bitrate: %d, samplerate: %d, filepos: 0x%llX, dataoffs: 0x%X, size: 0x%X\n", nframe, prot, layer, bitrate, samplerate, deadbeef->ftell (buffer->file)-8, data_ptr, packetlength);
+//            }
         }
         else {
-            lastframe_valid = 0;
             trace ("frame %d samplerate or bitrate is invalid\n", nframe);
+            lastframe_valid = 0;
             continue;
         }
 // }}}
@@ -410,12 +424,12 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
         valid_frames++;
 
 // {{{ update stream parameters, only when sample!=0 or 1st frame
-        trace ("valid_frames: %d, have_info: %d, lastframe_valid=%d\n", valid_frames, have_info, lastframe_valid);
-        if (!have_info && lastframe_valid)
+        if (sample != 0 || nframe == 0)
         {
+            if (sample == 0 && lastframe_valid) {
+                return 0;
+            }
             // don't get parameters from frames coming after any bad frame
-            trace ("\033[0;31mgot info!\033[37;0m\n");
-            have_info = 1;
             buffer->version = ver;
             buffer->layer = layer;
             buffer->bitrate = bitrate;
@@ -425,10 +439,10 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
                 buffer->channels = nchannels;
             }
             buffer->bitspersample = 16;
-            trace ("frame %d mpeg v%d layer %d bitrate %d samplerate %d packetlength %d channels %d\n", nframe, ver, layer, bitrate, samplerate, packetlength, nchannels);
+//            trace ("frame %d mpeg v%d layer %d bitrate %d samplerate %d packetlength %d channels %d\n", nframe, ver, layer, bitrate, samplerate, packetlength, nchannels);
         }
 // }}}
-        //trace ("lastframe_valid=1, valid_frames=%d, sample=%d, nframe=%d\n", valid_frames, sample, nframe);
+
         lastframe_valid = 1;
 
         int64_t framepos = deadbeef->ftell (buffer->file)-(int)sizeof(fb);
@@ -483,7 +497,7 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
                         }
                         uint32_t nframes = extract_i32 (buf);
                         if (sample == 0) {
-                            buffer->duration = (((uint64_t)nframes * (uint64_t)samples_per_frame) - buffer->delay - buffer->padding)/ (uint64_t)samplerate;
+                            buffer->duration = (((uint64_t)nframes * (uint64_t)samples_per_frame) - buffer->delay - buffer->padding)/ (float)samplerate;
                         }
                         trace ("xing totalsamples: %d, nframes: %d, samples_per_frame: %d\n", nframes*samples_per_frame, nframes, samples_per_frame);
                         if (nframes <= 0 || samples_per_frame <= 0) {
@@ -561,12 +575,11 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
                     }
                     if (sample <= 0 && (flags&FRAMES_FLAG)) {
                         buffer->have_xing_header = 1;
-                        deadbeef->fseek (buffer->file, framepos+packetlength, SEEK_SET);
+                        buffer->startoffset = framepos+packetlength;
+                        deadbeef->fseek (buffer->file, buffer->startoffset, SEEK_SET);
                         if (fsize >= 0) {
-                            buffer->bitrate = (fsize - deadbeef->ftell (buffer->file))/ buffer->samplerate * 1000;
+                            buffer->bitrate = (fsize - buffer->startoffset - buffer->endoffset)/ buffer->samplerate * 1000;
                         }
-                        buffer->startoffset = deadbeef->ftell (buffer->file);
-                        continue;
                     }
                 }
             }
@@ -585,7 +598,7 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
                         // unable to determine duration
                         buffer->duration = -1;
                         buffer->totalsamples = -1;
-                        if (sample == 0 && !have_info) {
+                        if (sample == 0) {
                             trace ("check validity of the next frame...\n");
                             deadbeef->fseek (buffer->file, framepos+packetlength, SEEK_SET);
                             continue;
@@ -597,14 +610,13 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
                     buffer->avg_packetlength = packetlength;
                     buffer->avg_samplerate = samplerate;
                     buffer->avg_samples_per_frame = samples_per_frame;
-                    buffer->duration = (buffer->nframes * samples_per_frame - buffer->delay - buffer->padding) / samplerate;
+                    buffer->duration = (((uint64_t)buffer->nframes * (uint64_t)samples_per_frame) - buffer->delay - buffer->padding)/ (float)samplerate;
                     buffer->totalsamples = buffer->nframes * samples_per_frame;
                     trace ("totalsamples: %d, samplesperframe: %d, fsize=%lld\n", buffer->totalsamples, samples_per_frame, fsize);
 //                    trace ("bitrate=%d, layer=%d, packetlength=%d, fsize=%d, nframes=%d, samples_per_frame=%d, samplerate=%d, duration=%f, totalsamples=%d\n", bitrate, layer, packetlength, sz, nframe, samples_per_frame, samplerate, buffer->duration, buffer->totalsamples);
 
-                    deadbeef->fseek (buffer->file, framepos, SEEK_SET);
-                    if (sample == 0 && have_info) {
-                        trace ("scan finished\n");
+                    if (sample == 0) {
+                        deadbeef->fseek (buffer->file, framepos, SEEK_SET);
                         return 0;
                     }
                 }
@@ -649,7 +661,7 @@ cmp3_scan_stream (buffer_t *buffer, int sample) {
         scansamples += samples_per_frame;
         nframe++;
         if (packetlength > 0) {
-            deadbeef->fseek (buffer->file, framepos+packetlength, SEEK_SET);
+            deadbeef->fseek (buffer->file, packetlength-(int)sizeof(fb), SEEK_CUR);
         }
     }
 end_scan:
@@ -657,33 +669,29 @@ end_scan:
         trace ("cmp3_scan_stream: couldn't find mpeg frames in file\n");
         return -1;
     }
-    if (sample == 0 && have_info) {
+    if (sample == 0) {
 // {{{ calculate final averages
         buffer->avg_packetlength /= (float)valid_frames;
         buffer->avg_samplerate /= valid_frames;
         buffer->avg_samples_per_frame /= valid_frames;
 //        avg_bitrate /= valid_frames;
         //trace ("valid_frames=%d, avg_bitrate=%d, avg_packetlength=%f, avg_samplerate=%d, avg_samples_per_frame=%d\n", valid_frames, avg_bitrate, buffer->avg_packetlength, buffer->avg_samplerate, buffer->avg_samples_per_frame);
-        trace ("startoffs: %d, endoffs: %d\n",  buffer->startoffset, buffer->endoffset);
+        trace ("startoffs: %lld, endoffs: %lld\n",  buffer->startoffset, buffer->endoffset);
 
         buffer->nframes = (fsize - buffer->startoffset - buffer->endoffset) / buffer->avg_packetlength;
         if (!buffer->have_xing_header) {
             buffer->totalsamples = buffer->nframes * buffer->avg_samples_per_frame;
-            buffer->duration = (buffer->totalsamples - buffer->delay - buffer->padding) / buffer->avg_samplerate;
+            buffer->duration = (buffer->totalsamples - buffer->delay - buffer->padding) / (float)buffer->avg_samplerate;
         }
-        buffer->bitrate = (fsize-buffer->startoffset-buffer->endoffset) / buffer->duration * 8;
-        trace ("nframes: %d, fsize: %lld, spf: %d, smp: %d, totalsamples: %d, real_smp: %d\n", buffer->nframes, fsize, buffer->avg_samples_per_frame, buffer->avg_samplerate, buffer->totalsamples, buffer->samplerate);
+        buffer->bitrate = (fsize - buffer->startoffset - buffer->endoffset) / buffer->duration * 8;
+        trace ("nframes: %d, fsize: %lld, spf: %d, smp: %d, totalsamples: %d\n", buffer->nframes, fsize, buffer->avg_samples_per_frame, buffer->avg_samplerate, buffer->totalsamples);
 // }}}
         return 0;
     }
 
-    if (buffer->samplerate <= 0) {
-        trace ("invalid samplerate\n");
-        return -1;
-    }
     buffer->totalsamples = scansamples;
-    buffer->duration = (buffer->totalsamples - buffer->delay - buffer->padding) / buffer->samplerate;
-//    trace ("nframes=%d, totalsamples=%d, samplerate=%d, dur=%f\n", nframe, scansamples, buffer->samplerate, buffer->duration);
+    buffer->duration = (buffer->totalsamples - buffer->delay - buffer->padding) / (float)buffer->samplerate;
+//    printf ("nframes=%d, totalsamples=%d, samplerate=%d, dur=%f\n", nframe, scansamples, buffer->samplerate, buffer->duration);
     return 0;
 }
 
@@ -836,14 +844,6 @@ cmp3_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
     }
     else {
         deadbeef->fset_track (info->buffer.file, it);
-        int64_t len = deadbeef->fgetlength (info->buffer.file);
-        if (len > 0) {
-            deadbeef->pl_delete_all_meta (it);
-            int v2err = deadbeef->junk_id3v2_read (it, info->buffer.file);
-            if (v2err != 0) {
-                deadbeef->fseek (info->buffer.file, 0, SEEK_SET);
-            }
-        }
         deadbeef->pl_add_meta (it, "title", NULL);
         int res = cmp3_scan_stream (&info->buffer, 0);
         if (res < 0) {
@@ -1441,7 +1441,7 @@ cmp3_write_metadata (DB_playItem_t *it) {
 }
 
 static const char *exts[] = {
-	"mp1", "mp2", "mp3", NULL
+	"mp1", "mp2", "mp3", "mpga", NULL
 };
 
 static const char settings_dlg[] =
@@ -1459,21 +1459,26 @@ static DB_decoder_t plugin = {
     .plugin.name = "MPEG decoder",
     .plugin.descr = "MPEG v1/2 layer1/2/3 decoder based on libmad",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "MPEG decoder plugin based on libmad\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+        "\n"
+        "This software is provided 'as-is', without any express or implied\n"
+        "warranty.  In no event will the authors be held liable for any damages\n"
+        "arising from the use of this software.\n"
+        "\n"
+        "Permission is granted to anyone to use this software for any purpose,\n"
+        "including commercial applications, and to alter it and redistribute it\n"
+        "freely, subject to the following restrictions:\n"
         "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "1. The origin of this software must not be misrepresented; you must not\n"
+        " claim that you wrote the original software. If you use this software\n"
+        " in a product, an acknowledgment in the product documentation would be\n"
+        " appreciated but is not required.\n"
         "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
+        "2. Altered source versions must be plainly marked as such, and must not be\n"
+        " misrepresented as being the original software.\n"
         "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "3. This notice may not be removed or altered from any source distribution.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .plugin.configdialog = settings_dlg,
diff --git a/plugins/musepack/COPYING b/plugins/musepack/COPYING
new file mode 100644
index 0000000..ed8dc12
--- /dev/null
+++ b/plugins/musepack/COPYING
@@ -0,0 +1,56 @@
+MusePack decoder plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko
+Uses Musepack SV8 libs (r435), (C) 2005-2009, The Musepack Development Team
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+Musepack SV8 libs (r435)
+Copyright (c) 2005-2009, The Musepack Development Team
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following
+disclaimer in the documentation and/or other materials provided
+with the distribution.
+
+* Neither the name of the The Musepack Development Team nor the
+names of its contributors may be used to endorse or promote
+products derived from this software without specific prior
+written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/plugins/musepack/Makefile.am b/plugins/musepack/Makefile.am
index c82490a..513c694 100644
--- a/plugins/musepack/Makefile.am
+++ b/plugins/musepack/Makefile.am
@@ -24,7 +24,7 @@ mpc/streaminfo.h\
 mpc/mpc_types.h\
 mpc/minimax.h
 
-musepack_la_LDFLAGS = -module
+musepack_la_LDFLAGS = -module -avoid-version
 musepack_la_LIBADD = $(LDADD) -lm
 
 AM_CFLAGS = $(CFLAGS) -fPIC -std=c99
diff --git a/plugins/musepack/Makefile.in b/plugins/musepack/Makefile.in
index aae07e5..57de3db 100644
--- a/plugins/musepack/Makefile.in
+++ b/plugins/musepack/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/musepack
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -120,23 +148,48 @@ am__musepack_la_SOURCES_DIST = musepack.c huffman.c mpc_bits_reader.c \
 @HAVE_MUSEPACK_TRUE@	mpc_demux.lo mpc_reader.lo requant.lo \
 @HAVE_MUSEPACK_TRUE@	streaminfo.lo synth_filter.lo crc32.lo
 musepack_la_OBJECTS = $(am_musepack_la_OBJECTS)
-musepack_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+musepack_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(musepack_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_MUSEPACK_TRUE at am_musepack_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(musepack_la_SOURCES)
 DIST_SOURCES = $(am__musepack_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -144,6 +197,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -170,6 +240,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -190,10 +261,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -216,6 +289,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -269,6 +343,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -287,6 +362,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -312,13 +389,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -327,7 +408,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -408,7 +491,7 @@ top_srcdir = @top_srcdir@
 @HAVE_MUSEPACK_TRUE at mpc/mpc_types.h\
 @HAVE_MUSEPACK_TRUE at mpc/minimax.h
 
- at HAVE_MUSEPACK_TRUE@musepack_la_LDFLAGS = -module
+ at HAVE_MUSEPACK_TRUE@musepack_la_LDFLAGS = -module -avoid-version
 @HAVE_MUSEPACK_TRUE at musepack_la_LIBADD = $(LDADD) -lm
 @HAVE_MUSEPACK_TRUE at AM_CFLAGS = $(CFLAGS) -fPIC -std=c99
 all: all-am
@@ -445,6 +528,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -471,14 +555,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 musepack.la: $(musepack_la_OBJECTS) $(musepack_la_DEPENDENCIES) $(EXTRA_musepack_la_DEPENDENCIES) 
-	$(musepack_la_LINK) $(am_musepack_la_rpath) $(musepack_la_OBJECTS) $(musepack_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(musepack_la_LINK) $(am_musepack_la_rpath) $(musepack_la_OBJECTS) $(musepack_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -498,25 +585,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/synth_filter.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -524,26 +611,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -555,15 +631,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -572,6 +644,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -716,19 +803,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/musepack/musepack.c b/plugins/musepack/musepack.c
index ea654e3..e7e41f5 100644
--- a/plugins/musepack/musepack.c
+++ b/plugins/musepack/musepack.c
@@ -1,20 +1,27 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    MusePack decoder plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko
+    Uses Musepack SV8 libs (r435), (C) 2005-2009, The Musepack Development Team
 
-    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 software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
 
-    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.
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
+
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -538,23 +545,27 @@ static DB_decoder_t plugin = {
     .plugin.name = "MusePack decoder",
     .plugin.descr = "Musepack decoder using libmppdec",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
-        "\n"
+        "MusePack decoder plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko\n"
         "Uses Musepack SV8 libs (r435), (C) 2005-2009, The Musepack Development Team\n"
         "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "This software is provided 'as-is', without any express or implied\n"
+        "warranty.  In no event will the authors be held liable for any damages\n"
+        "arising from the use of this software.\n"
+        "\n"
+        "Permission is granted to anyone to use this software for any purpose,\n"
+        "including commercial applications, and to alter it and redistribute it\n"
+        "freely, subject to the following restrictions:\n"
+        "\n"
+        "1. The origin of this software must not be misrepresented; you must not\n"
+        " claim that you wrote the original software. If you use this software\n"
+        " in a product, an acknowledgment in the product documentation would be\n"
+        " appreciated but is not required.\n"
         "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
+        "2. Altered source versions must be plainly marked as such, and must not be\n"
+        " misrepresented as being the original software.\n"
         "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "3. This notice may not be removed or altered from any source distribution.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .plugin.start = musepack_start,
diff --git a/plugins/notify/COPYING b/plugins/notify/COPYING
new file mode 100644
index 0000000..8b6f3fd
--- /dev/null
+++ b/plugins/notify/COPYING
@@ -0,0 +1,17 @@
+OSD Notification plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko and contributors
+
+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.
+
diff --git a/plugins/notify/Makefile.am b/plugins/notify/Makefile.am
index f499458..afcd5cb 100644
--- a/plugins/notify/Makefile.am
+++ b/plugins/notify/Makefile.am
@@ -2,7 +2,7 @@ if HAVE_NOTIFY
 notifydir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = notify.la
 notify_la_SOURCES = notify.c
-notify_la_LDFLAGS = -module
+notify_la_LDFLAGS = -module -avoid-version
 
 notify_la_LIBADD = $(LDADD) $(NOTIFY_LIBS)
 AM_CFLAGS = $(CFLAGS) $(NOTIFY_CFLAGS) -std=c99
diff --git a/plugins/notify/Makefile.in b/plugins/notify/Makefile.in
index d032880..cd98d93 100644
--- a/plugins/notify/Makefile.in
+++ b/plugins/notify/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/notify
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -114,23 +142,48 @@ am__DEPENDENCIES_1 =
 am__notify_la_SOURCES_DIST = notify.c
 @HAVE_NOTIFY_TRUE at am_notify_la_OBJECTS = notify.lo
 notify_la_OBJECTS = $(am_notify_la_OBJECTS)
-notify_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+notify_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(notify_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_NOTIFY_TRUE at am_notify_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(notify_la_SOURCES)
 DIST_SOURCES = $(am__notify_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,6 +191,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,6 +234,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -184,10 +255,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -210,6 +283,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -263,6 +337,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -281,6 +356,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -306,13 +383,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -321,7 +402,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -382,7 +465,7 @@ top_srcdir = @top_srcdir@
 @HAVE_NOTIFY_TRUE at notifydir = $(libdir)/$(PACKAGE)
 @HAVE_NOTIFY_TRUE at pkglib_LTLIBRARIES = notify.la
 @HAVE_NOTIFY_TRUE at notify_la_SOURCES = notify.c
- at HAVE_NOTIFY_TRUE@notify_la_LDFLAGS = -module
+ at HAVE_NOTIFY_TRUE@notify_la_LDFLAGS = -module -avoid-version
 @HAVE_NOTIFY_TRUE at notify_la_LIBADD = $(LDADD) $(NOTIFY_LIBS)
 @HAVE_NOTIFY_TRUE at AM_CFLAGS = $(CFLAGS) $(NOTIFY_CFLAGS) -std=c99
 all: all-am
@@ -419,6 +502,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -445,14 +529,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 notify.la: $(notify_la_OBJECTS) $(notify_la_DEPENDENCIES) $(EXTRA_notify_la_DEPENDENCIES) 
-	$(notify_la_LINK) $(am_notify_la_rpath) $(notify_la_OBJECTS) $(notify_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(notify_la_LINK) $(am_notify_la_rpath) $(notify_la_OBJECTS) $(notify_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -463,25 +550,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/notify.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,26 +576,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +596,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +609,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -681,19 +768,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/notify/notify.c b/plugins/notify/notify.c
index 86f7ee5..0364ea0 100644
--- a/plugins/notify/notify.c
+++ b/plugins/notify/notify.c
@@ -1,6 +1,6 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    OSD Notification plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko and contributors
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
@@ -87,36 +87,6 @@ notify_thread (void *ctx) {
 
 }
 
-#if 0
-static void
-notify_marshal_dict_byte(DBusMessageIter *iter, const char *key, char value)
-{
-  DBusMessageIter entry, variant;
-
-  if (!key || !value) return;
-
-  dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY, NULL, &entry);
-  dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-  dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, "y", &variant);
-  dbus_message_iter_append_basic(&variant, DBUS_TYPE_BYTE, &value);
-  dbus_message_iter_close_container(&entry, &variant);
-  dbus_message_iter_close_container(iter, &entry);
-}
-
-static void
-notify_marshal_dict_string(DBusMessageIter *iter, const char *key, const char *value)
-{
-  DBusMessageIter entry, variant;
-
-  dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY, "sv", &entry);
-  dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-  dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, "s", &variant);
-  dbus_message_iter_append_basic(&variant, DBUS_TYPE_STRING, &value);
-  dbus_message_iter_close_container(&entry, &variant);
-  dbus_message_iter_close_container(iter, &entry);
-}
-#endif
-
 static void
 esc_xml (const char *cmd, char *esc, int size) {
     const char *src = cmd;
@@ -343,7 +313,8 @@ DB_misc_t plugin = {
     .plugin.name = "OSD Notify",
     .plugin.descr = "Displays notifications when new track starts.\nRequires dbus and notification daemon to be running.\nNotification daemon should be provided by your desktop environment.\n",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "OSD Notification plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko and contributors\n"
         "\n"
         "This program is free software; you can redistribute it and/or\n"
         "modify it under the terms of the GNU General Public License\n"
diff --git a/plugins/nullout/COPYING b/plugins/nullout/COPYING
new file mode 100644
index 0000000..b311577
--- /dev/null
+++ b/plugins/nullout/COPYING
@@ -0,0 +1,21 @@
+Null output plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
diff --git a/plugins/nullout/Makefile.am b/plugins/nullout/Makefile.am
index 73e6313..97042f9 100644
--- a/plugins/nullout/Makefile.am
+++ b/plugins/nullout/Makefile.am
@@ -2,6 +2,6 @@ if HAVE_NULLOUT
 nulloutdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = nullout.la
 nullout_la_SOURCES = nullout.c
-nullout_la_LDFLAGS = -module
+nullout_la_LDFLAGS = -module -avoid-version
 AM_CFLAGS = $(CFLAGS) -std=c99
 endif
diff --git a/plugins/nullout/Makefile.in b/plugins/nullout/Makefile.in
index 4fc42bc..d65ac3b 100644
--- a/plugins/nullout/Makefile.in
+++ b/plugins/nullout/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/nullout
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -113,23 +141,48 @@ nullout_la_LIBADD =
 am__nullout_la_SOURCES_DIST = nullout.c
 @HAVE_NULLOUT_TRUE at am_nullout_la_OBJECTS = nullout.lo
 nullout_la_OBJECTS = $(am_nullout_la_OBJECTS)
-nullout_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+nullout_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(nullout_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_NULLOUT_TRUE at am_nullout_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(nullout_la_SOURCES)
 DIST_SOURCES = $(am__nullout_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -137,6 +190,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -163,6 +233,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -183,10 +254,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -209,6 +282,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -262,6 +336,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -280,6 +355,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -305,13 +382,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -320,7 +401,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -381,7 +464,7 @@ top_srcdir = @top_srcdir@
 @HAVE_NULLOUT_TRUE at nulloutdir = $(libdir)/$(PACKAGE)
 @HAVE_NULLOUT_TRUE at pkglib_LTLIBRARIES = nullout.la
 @HAVE_NULLOUT_TRUE at nullout_la_SOURCES = nullout.c
- at HAVE_NULLOUT_TRUE@nullout_la_LDFLAGS = -module
+ at HAVE_NULLOUT_TRUE@nullout_la_LDFLAGS = -module -avoid-version
 @HAVE_NULLOUT_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
 all: all-am
 
@@ -417,6 +500,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -443,14 +527,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 nullout.la: $(nullout_la_OBJECTS) $(nullout_la_DEPENDENCIES) $(EXTRA_nullout_la_DEPENDENCIES) 
-	$(nullout_la_LINK) $(am_nullout_la_rpath) $(nullout_la_OBJECTS) $(nullout_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(nullout_la_LINK) $(am_nullout_la_rpath) $(nullout_la_OBJECTS) $(nullout_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -461,25 +548,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nullout.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -487,26 +574,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -518,15 +594,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -535,6 +607,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -679,19 +766,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/nullout/nullout.c b/plugins/nullout/nullout.c
index 1a58f4d..febb1b0 100644
--- a/plugins/nullout/nullout.c
+++ b/plugins/nullout/nullout.c
@@ -1,20 +1,26 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    Null output plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko
 
-    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 software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
 
-    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.
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
+
 #include <stdint.h>
 #include <unistd.h>
 #ifdef __linux__
@@ -196,24 +202,29 @@ static DB_output_t plugin = {
     .plugin.version_minor = 0,
     .plugin.type = DB_PLUGIN_OUTPUT,
     .plugin.id = "nullout",
-    .plugin.name = "null output plugin",
-    .plugin.descr = "doesn't play anything",
+    .plugin.name = "Null output plugin",
+    .plugin.descr = "This plugin takes the audio data, and discards it\n, so nothing will play.\nThis is useful for testing.",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
-        "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
-        "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
-        "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+    "Null output plugin for DeaDBeeF Player\n"
+    "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+    "\n"
+    "This software is provided 'as-is', without any express or implied\n"
+    "warranty.  In no event will the authors be held liable for any damages\n"
+    "arising from the use of this software.\n"
+    "\n"
+    "Permission is granted to anyone to use this software for any purpose,\n"
+    "including commercial applications, and to alter it and redistribute it\n"
+    "freely, subject to the following restrictions:\n"
+    "\n"
+    "1. The origin of this software must not be misrepresented; you must not\n"
+    " claim that you wrote the original software. If you use this software\n"
+    " in a product, an acknowledgment in the product documentation would be\n"
+    " appreciated but is not required.\n"
+    "\n"
+    "2. Altered source versions must be plainly marked as such, and must not be\n"
+    " misrepresented as being the original software.\n"
+    "\n"
+    "3. This notice may not be removed or altered from any source distribution.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .plugin.start = null_start,
diff --git a/plugins/oss/COPYING b/plugins/oss/COPYING
new file mode 100644
index 0000000..c61cba1
--- /dev/null
+++ b/plugins/oss/COPYING
@@ -0,0 +1,16 @@
+OSS output plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko and contributors
+
+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, see <http://www.gnu.org/licenses/>.
+
diff --git a/plugins/oss/Makefile.am b/plugins/oss/Makefile.am
index cd7e167..61ff079 100644
--- a/plugins/oss/Makefile.am
+++ b/plugins/oss/Makefile.am
@@ -3,5 +3,5 @@ ossdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = oss.la
 AM_CFLAGS = $(CFLAGS) $(OSS_CFLAGS) -std=c99
 oss_la_SOURCES = oss.c
-oss_la_LDFLAGS = -module
+oss_la_LDFLAGS = -module -avoid-version
 endif
diff --git a/plugins/oss/Makefile.in b/plugins/oss/Makefile.in
index d624237..7fff2ce 100644
--- a/plugins/oss/Makefile.in
+++ b/plugins/oss/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/oss
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -113,23 +141,48 @@ oss_la_LIBADD =
 am__oss_la_SOURCES_DIST = oss.c
 @HAVE_OSS_TRUE at am_oss_la_OBJECTS = oss.lo
 oss_la_OBJECTS = $(am_oss_la_OBJECTS)
-oss_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(oss_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+oss_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(oss_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_OSS_TRUE at am_oss_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(oss_la_SOURCES)
 DIST_SOURCES = $(am__oss_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -137,6 +190,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -163,6 +233,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -183,10 +254,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -209,6 +282,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -262,6 +336,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -280,6 +355,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -305,13 +382,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -320,7 +401,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -382,7 +465,7 @@ top_srcdir = @top_srcdir@
 @HAVE_OSS_TRUE at pkglib_LTLIBRARIES = oss.la
 @HAVE_OSS_TRUE at AM_CFLAGS = $(CFLAGS) $(OSS_CFLAGS) -std=c99
 @HAVE_OSS_TRUE at oss_la_SOURCES = oss.c
- at HAVE_OSS_TRUE@oss_la_LDFLAGS = -module
+ at HAVE_OSS_TRUE@oss_la_LDFLAGS = -module -avoid-version
 all: all-am
 
 .SUFFIXES:
@@ -417,6 +500,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -443,14 +527,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 oss.la: $(oss_la_OBJECTS) $(oss_la_DEPENDENCIES) $(EXTRA_oss_la_DEPENDENCIES) 
-	$(oss_la_LINK) $(am_oss_la_rpath) $(oss_la_OBJECTS) $(oss_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(oss_la_LINK) $(am_oss_la_rpath) $(oss_la_OBJECTS) $(oss_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -461,25 +548,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/oss.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -487,26 +574,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -518,15 +594,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -535,6 +607,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -679,19 +766,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/oss/oss.c b/plugins/oss/oss.c
index e7c272c..458b8a9 100644
--- a/plugins/oss/oss.c
+++ b/plugins/oss/oss.c
@@ -1,6 +1,6 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    OSS output plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko and contributors
 
     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
@@ -73,7 +73,7 @@ oss_set_hwparams (ddb_waveformat_t *fmt) {
         break;
     }
     if (ioctl (fd, SNDCTL_DSP_SETFMT, &samplefmt) == -1) {
-        fprintf (stderr, "oss: failed to set format\n");
+        fprintf (stderr, "oss: failed to set format (return: %d)\n", samplefmt);
         perror ("SNDCTL_DSP_SETFMT");
         return -1;
     }
@@ -133,11 +133,10 @@ oss_init (void) {
     mutex = 0;
 
     // prepare oss for playback
-    const char *name = oss_device;
-    fd = open (name, O_WRONLY);
+    fd = open (oss_device, O_WRONLY);
     if (fd == -1) {
-        fprintf (stderr, "oss: failed to open file %s\n", name);
-        perror (name);
+        fprintf (stderr, "oss: failed to open file %s\n", oss_device);
+        perror (oss_device);
         plugin.free ();
         return -1;
     }
@@ -188,7 +187,7 @@ static int
 oss_stop (void) {
     state = OUTPUT_STATE_STOPPED;
     deadbeef->streamer_reset (1);
-    return oss_free();
+    return 0;
 }
 
 static int
@@ -196,8 +195,6 @@ oss_pause (void) {
     if (state == OUTPUT_STATE_STOPPED) {
         return -1;
     }
-    // set pause state
-    oss_free();
     state = OUTPUT_STATE_PAUSED;
     return 0;
 }
@@ -214,23 +211,22 @@ oss_setformat (ddb_waveformat_t *fmt) {
     }
 
     int _state = state;
-    int v4workaround = deadbeef->conf_get_int ("oss.v4workaround", 0);
-
-    if (v4workaround) {
-        oss_stop ();
-        memcpy (&plugin.fmt, fmt, sizeof (ddb_waveformat_t));
-    }
-    else {
-        deadbeef->mutex_lock (mutex);
 
-        if (0 != oss_set_hwparams (fmt)) {
-            deadbeef->mutex_unlock (mutex);
-            return -1;
-        }
+    deadbeef->mutex_lock (mutex);
 
+    if (fd) {
+        close (fd);
+        fd = 0;
+    }
+    fd = open (oss_device, O_WRONLY);
+    memcpy (&plugin.fmt, fmt, sizeof (ddb_waveformat_t));
+    if (0 != oss_set_hwparams (fmt)) {
         deadbeef->mutex_unlock (mutex);
+        return -1;
     }
 
+    deadbeef->mutex_unlock (mutex);
+
     switch (_state) {
     case OUTPUT_STATE_STOPPED:
         return oss_stop ();
@@ -368,8 +364,7 @@ oss_load (DB_functions_t *api) {
 }
 
 static const char settings_dlg[] =
-    "property \"Device file\" entry oss.device /dev/dsp;\n"
-    "property \"OSS4 samplerate bug workaround\" checkbox oss.v4workaround 0;\n";
+    "property \"Device file\" entry oss.device /dev/dsp;\n";
 
 // define plugin interface
 static DB_output_t plugin = {
@@ -382,7 +377,8 @@ static DB_output_t plugin = {
     .plugin.name = "OSS output plugin",
     .plugin.descr = "plays sound via OSS API",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "OSS output plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko and contributors\n"
         "\n"
         "This program is free software; you can redistribute it and/or\n"
         "modify it under the terms of the GNU General Public License\n"
diff --git a/plugins/pltbrowser/COPYING b/plugins/pltbrowser/COPYING
new file mode 100644
index 0000000..f82e4d3
--- /dev/null
+++ b/plugins/pltbrowser/COPYING
@@ -0,0 +1,21 @@
+Playlist browser widget plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
diff --git a/plugins/pltbrowser/Makefile.am b/plugins/pltbrowser/Makefile.am
index 73923b5..ffcc610 100644
--- a/plugins/pltbrowser/Makefile.am
+++ b/plugins/pltbrowser/Makefile.am
@@ -15,12 +15,12 @@ endif
 AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
 
 if HAVE_GTK2
-pltbrowser_gtk2_la_SOURCES = pltbrowser.c
-pltbrowser_gtk2_la_LDFLAGS = -module
+pltbrowser_gtk2_la_SOURCES = pltbrowser.c support.c support.h
+pltbrowser_gtk2_la_LDFLAGS = -module -avoid-version
 if STATICLINK
 GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr
 
-pltbrowser_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la
+pltbrowser_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lrt
 
 pltbrowser_gtk2_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
 else
@@ -31,18 +31,9 @@ endif
 
 if HAVE_GTK3
 pltbrowser_gtk3_la_SOURCES = pltbrowser.c
-pltbrowser_gtk3_la_LDFLAGS = -module
-if STATICLINK
-GTK_ROOT_300=@top_srcdir@/$(LIB)/gtk-3.0.0
-
-pltbrowser_gtk3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD)
-
-pltbrowser_gtk3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS)
-
-else
+pltbrowser_gtk3_la_LDFLAGS = -module -avoid-version
 pltbrowser_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
 pltbrowser_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
 endif
-endif
 
 endif
diff --git a/plugins/pltbrowser/Makefile.in b/plugins/pltbrowser/Makefile.in
index bda1456..1504334 100644
--- a/plugins/pltbrowser/Makefile.in
+++ b/plugins/pltbrowser/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/pltbrowser
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -111,22 +139,16 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_FALSE at pltbrowser_gtk2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at pltbrowser_gtk2_la_DEPENDENCIES = $(GTK_ROOT)/lib/libgtk-x11-2.0.la \
- at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgdk-x11-2.0.la \
- at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libpangoft2-1.0.la \
- at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libpangocairo-1.0.la \
- at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la \
- at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libcairo.la \
- at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libpango-1.0.la \
- at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgobject-2.0.la \
- at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgmodule-2.0.la \
- at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgthread-2.0.la \
- at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libglib-2.0.la
-am__pltbrowser_gtk2_la_SOURCES_DIST = pltbrowser.c
- at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE at am_pltbrowser_gtk2_la_OBJECTS = pltbrowser_gtk2_la-pltbrowser.lo
+am__pltbrowser_gtk2_la_SOURCES_DIST = pltbrowser.c support.c support.h
+ at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE at am_pltbrowser_gtk2_la_OBJECTS = pltbrowser_gtk2_la-pltbrowser.lo \
+ at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@	pltbrowser_gtk2_la-support.lo
 pltbrowser_gtk2_la_OBJECTS = $(am_pltbrowser_gtk2_la_OBJECTS)
-pltbrowser_gtk2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+pltbrowser_gtk2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(pltbrowser_gtk2_la_CFLAGS) $(CFLAGS) \
 	$(pltbrowser_gtk2_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@HAVE_PLTBROWSER_TRUE at am_pltbrowser_gtk2_la_rpath =  \
@@ -135,12 +157,13 @@ pltbrowser_gtk2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at am_pltbrowser_gtk2_la_rpath =  \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@	-rpath \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@	$(pkglibdir)
- at HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_FALSE at pltbrowser_gtk3_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ at HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk3_la_DEPENDENCIES =  \
+ at HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@	$(am__DEPENDENCIES_1)
 am__pltbrowser_gtk3_la_SOURCES_DIST = pltbrowser.c
 @HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at am_pltbrowser_gtk3_la_OBJECTS = pltbrowser_gtk3_la-pltbrowser.lo
 pltbrowser_gtk3_la_OBJECTS = $(am_pltbrowser_gtk3_la_OBJECTS)
-pltbrowser_gtk3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+pltbrowser_gtk3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(pltbrowser_gtk3_la_CFLAGS) $(CFLAGS) \
 	$(pltbrowser_gtk3_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at am_pltbrowser_gtk3_la_rpath =  \
@@ -149,19 +172,40 @@ pltbrowser_gtk3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at am_pltbrowser_gtk3_la_rpath =  \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@	-rpath \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@	$(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(pltbrowser_gtk2_la_SOURCES) $(pltbrowser_gtk3_la_SOURCES)
 DIST_SOURCES = $(am__pltbrowser_gtk2_la_SOURCES_DIST) \
 	$(am__pltbrowser_gtk3_la_SOURCES_DIST)
@@ -170,6 +214,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -196,6 +257,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -216,10 +278,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -242,6 +306,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -295,6 +360,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -313,6 +379,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -338,13 +406,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -353,7 +425,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -415,20 +489,17 @@ top_srcdir = @top_srcdir@
 @HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@HAVE_PLTBROWSER_TRUE at pkglib_LTLIBRARIES = pltbrowser_gtk2.la
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at pkglib_LTLIBRARIES = pltbrowser_gtk2.la pltbrowser_gtk3.la
 @HAVE_PLTBROWSER_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
- at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk2_la_SOURCES = pltbrowser.c
- at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk2_la_LDFLAGS = -module
+ at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk2_la_SOURCES = pltbrowser.c support.c support.h
+ at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk2_la_LDFLAGS = -module -avoid-version
 @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at GTK_ROOT = @top_srcdir@/$(LIB)/gtk-2.12.12/usr
 @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_FALSE at pltbrowser_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS)
- at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at pltbrowser_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la
+ at HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at pltbrowser_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lrt
 @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_FALSE at pltbrowser_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS)
 @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at pltbrowser_gtk2_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
 @HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk3_la_SOURCES = pltbrowser.c
- at HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk3_la_LDFLAGS = -module
- at HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at GTK_ROOT_300 = @top_srcdir@/$(LIB)/gtk-3.0.0
- at HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_FALSE at pltbrowser_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
- at HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at pltbrowser_gtk3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD)
- at HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_FALSE at pltbrowser_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
- at HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at pltbrowser_gtk3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS)
+ at HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk3_la_LDFLAGS = -module -avoid-version
+ at HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
+ at HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
 all: all-am
 
 .SUFFIXES:
@@ -463,6 +534,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -489,16 +561,20 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 pltbrowser_gtk2.la: $(pltbrowser_gtk2_la_OBJECTS) $(pltbrowser_gtk2_la_DEPENDENCIES) $(EXTRA_pltbrowser_gtk2_la_DEPENDENCIES) 
-	$(pltbrowser_gtk2_la_LINK) $(am_pltbrowser_gtk2_la_rpath) $(pltbrowser_gtk2_la_OBJECTS) $(pltbrowser_gtk2_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(pltbrowser_gtk2_la_LINK) $(am_pltbrowser_gtk2_la_rpath) $(pltbrowser_gtk2_la_OBJECTS) $(pltbrowser_gtk2_la_LIBADD) $(LIBS)
+
 pltbrowser_gtk3.la: $(pltbrowser_gtk3_la_OBJECTS) $(pltbrowser_gtk3_la_DEPENDENCIES) $(EXTRA_pltbrowser_gtk3_la_DEPENDENCIES) 
-	$(pltbrowser_gtk3_la_LINK) $(am_pltbrowser_gtk3_la_rpath) $(pltbrowser_gtk3_la_OBJECTS) $(pltbrowser_gtk3_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(pltbrowser_gtk3_la_LINK) $(am_pltbrowser_gtk3_la_rpath) $(pltbrowser_gtk3_la_OBJECTS) $(pltbrowser_gtk3_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -507,42 +583,50 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pltbrowser_gtk2_la-pltbrowser.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pltbrowser_gtk2_la-support.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pltbrowser_gtk3_la-pltbrowser.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 pltbrowser_gtk2_la-pltbrowser.lo: pltbrowser.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk2_la_CFLAGS) $(CFLAGS) -MT pltbrowser_gtk2_la-pltbrowser.lo -MD -MP -MF $(DEPDIR)/pltbrowser_gtk2_la-pltbrowser.Tpo -c -o pltbrowser_gtk2_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/pltbrowser_gtk2_la-pltbrowser.Tpo $(DEPDIR)/pltbrowser_gtk2_la-pltbrowser.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pltbrowser.c' object='pltbrowser_gtk2_la-pltbrowser.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk2_la_CFLAGS) $(CFLAGS) -MT pltbrowser_gtk2_la-pltbrowser.lo -MD -MP -MF $(DEPDIR)/pltbrowser_gtk2_la-pltbrowser.Tpo -c -o pltbrowser_gtk2_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pltbrowser_gtk2_la-pltbrowser.Tpo $(DEPDIR)/pltbrowser_gtk2_la-pltbrowser.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pltbrowser.c' object='pltbrowser_gtk2_la-pltbrowser.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk2_la_CFLAGS) $(CFLAGS) -c -o pltbrowser_gtk2_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
+
+pltbrowser_gtk2_la-support.lo: support.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk2_la_CFLAGS) $(CFLAGS) -MT pltbrowser_gtk2_la-support.lo -MD -MP -MF $(DEPDIR)/pltbrowser_gtk2_la-support.Tpo -c -o pltbrowser_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pltbrowser_gtk2_la-support.Tpo $(DEPDIR)/pltbrowser_gtk2_la-support.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='support.c' object='pltbrowser_gtk2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk2_la_CFLAGS) $(CFLAGS) -c -o pltbrowser_gtk2_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk2_la_CFLAGS) $(CFLAGS) -c -o pltbrowser_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
 
 pltbrowser_gtk3_la-pltbrowser.lo: pltbrowser.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk3_la_CFLAGS) $(CFLAGS) -MT pltbrowser_gtk3_la-pltbrowser.lo -MD -MP -MF $(DEPDIR)/pltbrowser_gtk3_la-pltbrowser.Tpo -c -o pltbrowser_gtk3_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/pltbrowser_gtk3_la-pltbrowser.Tpo $(DEPDIR)/pltbrowser_gtk3_la-pltbrowser.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pltbrowser.c' object='pltbrowser_gtk3_la-pltbrowser.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk3_la_CFLAGS) $(CFLAGS) -MT pltbrowser_gtk3_la-pltbrowser.lo -MD -MP -MF $(DEPDIR)/pltbrowser_gtk3_la-pltbrowser.Tpo -c -o pltbrowser_gtk3_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pltbrowser_gtk3_la-pltbrowser.Tpo $(DEPDIR)/pltbrowser_gtk3_la-pltbrowser.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pltbrowser.c' object='pltbrowser_gtk3_la-pltbrowser.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk3_la_CFLAGS) $(CFLAGS) -c -o pltbrowser_gtk3_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk3_la_CFLAGS) $(CFLAGS) -c -o pltbrowser_gtk3_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -550,26 +634,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -581,15 +654,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -598,6 +667,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -742,19 +826,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/pltbrowser/pltbrowser.c b/plugins/pltbrowser/pltbrowser.c
index 3ebf02f..cc21bc0 100644
--- a/plugins/pltbrowser/pltbrowser.c
+++ b/plugins/pltbrowser/pltbrowser.c
@@ -1,6 +1,6 @@
 /*
-    DeaDBeeF -- the music player
-    Copyright (C) 2009-2013 Alexey Yakovenko and other contributors
+    Playlist browser widget plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko
 
     This software is provided 'as-is', without any express or implied
     warranty.  In no event will the authors be held liable for any damages
@@ -29,6 +29,7 @@
 #endif
 #include "../gtkui/gtkui_api.h"
 #include "../../gettext.h"
+#include "support.h"
 
 DB_functions_t *deadbeef;
 static ddb_gtkui_t *gtkui_plugin;
@@ -53,31 +54,9 @@ on_pltbrowser_row_inserted (GtkTreeModel *tree_model, GtkTreePath *path, GtkTree
         return;
     }
 
-    char str1[100];
-    char str2[100];
-    char strcursor1[100];
-    char strcursor2[100];
-    int pos1;
-    int pos2;
-    int cursor1;
-    int cursor2;
-    snprintf (str1, sizeof (str1), "playlist.scroll.%d", plt->last_selected);
-    pos1 = deadbeef->conf_get_int (str1, 0);
-    snprintf (str2, sizeof (str2), "playlist.scroll.%d", idx);
-    pos2 = deadbeef->conf_get_int (str2, 0);
-
-    snprintf (strcursor1, sizeof (strcursor1), "playlist.cursor.%d", plt->last_selected);
-    cursor1 = deadbeef->conf_get_int (strcursor1, 0);
-    snprintf (strcursor2, sizeof (strcursor2), "playlist.cursor.%d", idx);
-    cursor2 = deadbeef->conf_get_int (strcursor2, 0);
-
     deadbeef->plt_move (plt->last_selected, idx);
-    deadbeef->conf_set_int (str1, pos2);
-    deadbeef->conf_set_int (str2, pos1);
-    deadbeef->conf_set_int (strcursor1, cursor2);
-    deadbeef->conf_set_int (strcursor2, cursor1);
     plt->last_selected = idx;
-    deadbeef->conf_set_int ("playlist.current", idx);
+    deadbeef->plt_set_curr_idx (idx);
     deadbeef->sendmessage (DB_EV_PLAYLISTSWITCHED, 0, 0, 0);
 }
 
@@ -94,13 +73,15 @@ on_pltbrowser_cursor_changed (GtkTreeView *treeview, gpointer user_data) {
     if (indices) {
         if (indices[0] >= 0) {
             deadbeef->plt_set_curr_idx (indices[0]);
-            deadbeef->conf_set_int ("playlist.current", indices[0]);
             w->last_selected = indices[0];
         }
         g_free (indices);
     }
 }
 
+gboolean
+on_pltbrowser_popup_menu (GtkWidget *widget, gpointer user_data);
+
 static gboolean
 fill_pltbrowser_cb (gpointer data) {
     w_pltbrowser_t *w = data;
@@ -131,6 +112,7 @@ fill_pltbrowser_cb (gpointer data) {
     deadbeef->pl_unlock ();
     w->ri_id = g_signal_connect ((gpointer)store, "row_inserted", G_CALLBACK (on_pltbrowser_row_inserted), w);
     w->cc_id = g_signal_connect ((gpointer)w->tree, "cursor_changed", G_CALLBACK (on_pltbrowser_cursor_changed), w);
+    g_signal_connect ((gpointer) w->tree, "popup_menu", G_CALLBACK (on_pltbrowser_popup_menu), NULL);
     return FALSE;
 }
 
@@ -159,29 +141,35 @@ on_pltbrowser_button_press_event         (GtkWidget       *widget,
         return FALSE;
     }
     if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
-        GtkTreePath *path;
-        GtkTreeViewColumn *col;
-        gtk_tree_view_get_cursor (GTK_TREE_VIEW(widget), &path, &col);
-        if (!path || !col) {
-            // reset
-            return FALSE;
-        }
-        int *indices = gtk_tree_path_get_indices (path);
-        int plt_idx;
-        if (indices) {
-            plt_idx = indices[0];
-            g_free (indices);
-        }
-        else {
-            return FALSE;
-        }
-
-        GtkWidget *menu = gtkui_plugin->create_pltmenu (plt_idx);
-        gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, widget, event->button, gtk_get_current_event_time());
+        return on_pltbrowser_popup_menu (widget, user_data);
     }
     return FALSE;
 }
 
+gboolean
+on_pltbrowser_popup_menu (GtkWidget *widget, gpointer user_data) {
+    GtkTreePath *path;
+    GtkTreeViewColumn *col;
+    gtk_tree_view_get_cursor (GTK_TREE_VIEW(widget), &path, &col);
+    if (!path || !col) {
+        // reset
+        return FALSE;
+    }
+    int *indices = gtk_tree_path_get_indices (path);
+    int plt_idx;
+    if (indices) {
+        plt_idx = indices[0];
+        g_free (indices);
+    }
+    else {
+        return FALSE;
+    }
+
+    GtkWidget *menu = gtkui_plugin->create_pltmenu (plt_idx);
+    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, widget, 0, gtk_get_current_event_time());
+    return TRUE;
+}
+
 static void
 on_pltbrowser_row_activated (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data) {
     deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, 0, 0);
@@ -245,7 +233,6 @@ static int
 pltbrowser_connect (void) {
     gtkui_plugin = (ddb_gtkui_t *)deadbeef->plug_get_for_id (DDB_GTKUI_PLUGIN_ID);
     if(!gtkui_plugin) {
-        fprintf (stderr, "pltbrowser: can't find gtkui plugin\n");
         return -1;
     }
     gtkui_plugin->w_reg_widget (_("Playlist browser"), 0, w_pltbrowser_create, "pltbrowser", NULL);
@@ -272,11 +259,15 @@ static DB_misc_t plugin = {
 #else
     .plugin.id = "pltbrowser_gtk2",
 #endif
-    .plugin.name = "pltbrowser",
-    .plugin.descr = "Playlist browser",
+#if GTK_CHECK_VERSION(3,0,0)
+    .plugin.name = "Playlist browser GTK3",
+#else
+    .plugin.name = "Playlist browser GTK2",
+#endif
+    .plugin.descr = "Use View -> Design Mode to add playlist browser into main window",
     .plugin.copyright = 
-        "DeaDBeeF -- the music player\n"
-        "Copyright (C) 2009-2013 Alexey Yakovenko and other contributors\n"
+        "Playlist browser widget plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko\n"
         "\n"
         "This software is provided 'as-is', without any express or implied\n"
         "warranty.  In no event will the authors be held liable for any damages\n"
diff --git a/plugins/converter/support.c b/plugins/pltbrowser/support.c
similarity index 100%
copy from plugins/converter/support.c
copy to plugins/pltbrowser/support.c
diff --git a/plugins/gtkui/support.h b/plugins/pltbrowser/support.h
similarity index 99%
copy from plugins/gtkui/support.h
copy to plugins/pltbrowser/support.h
index a4e8088..0410f15 100644
--- a/plugins/gtkui/support.h
+++ b/plugins/pltbrowser/support.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/pulse/COPYING b/plugins/pulse/COPYING
new file mode 100644
index 0000000..f624fe0
--- /dev/null
+++ b/plugins/pulse/COPYING
@@ -0,0 +1,18 @@
+PulseAudio output plugin for DeaDBeeF Player
+Copyright (C) 2011 Jan D. Behrens <zykure at web.de>
+Copyright (C) 2010-2012 Alexey Yakovenko <waker at users.sourceforge.net>
+Copyright (C) 2010 Anton Novikov <tonn.post at gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
diff --git a/plugins/pulse/Makefile.am b/plugins/pulse/Makefile.am
index d0e29c6..bdd7f38 100644
--- a/plugins/pulse/Makefile.am
+++ b/plugins/pulse/Makefile.am
@@ -3,6 +3,6 @@ pulsedir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = pulse.la
 AM_CFLAGS = $(CFLAGS) $(PULSE_DEPS_CFLAGS) -std=c99
 pulse_la_SOURCES = pulse.c
-pulse_la_LDFLAGS = -module
+pulse_la_LDFLAGS = -module -avoid-version
 pulse_la_LIBADD = $(LDADD) $(PULSE_DEPS_LIBS)
 endif
diff --git a/plugins/pulse/Makefile.in b/plugins/pulse/Makefile.in
index 2622226..0938cc3 100644
--- a/plugins/pulse/Makefile.in
+++ b/plugins/pulse/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/pulse
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -114,23 +142,48 @@ am__DEPENDENCIES_1 =
 am__pulse_la_SOURCES_DIST = pulse.c
 @HAVE_PULSE_TRUE at am_pulse_la_OBJECTS = pulse.lo
 pulse_la_OBJECTS = $(am_pulse_la_OBJECTS)
-pulse_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(pulse_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+pulse_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(pulse_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_PULSE_TRUE at am_pulse_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(pulse_la_SOURCES)
 DIST_SOURCES = $(am__pulse_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,6 +191,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,6 +234,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -184,10 +255,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -210,6 +283,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -263,6 +337,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -281,6 +356,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -306,13 +383,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -321,7 +402,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -383,7 +466,7 @@ top_srcdir = @top_srcdir@
 @HAVE_PULSE_TRUE at pkglib_LTLIBRARIES = pulse.la
 @HAVE_PULSE_TRUE at AM_CFLAGS = $(CFLAGS) $(PULSE_DEPS_CFLAGS) -std=c99
 @HAVE_PULSE_TRUE at pulse_la_SOURCES = pulse.c
- at HAVE_PULSE_TRUE@pulse_la_LDFLAGS = -module
+ at HAVE_PULSE_TRUE@pulse_la_LDFLAGS = -module -avoid-version
 @HAVE_PULSE_TRUE at pulse_la_LIBADD = $(LDADD) $(PULSE_DEPS_LIBS)
 all: all-am
 
@@ -419,6 +502,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -445,14 +529,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 pulse.la: $(pulse_la_OBJECTS) $(pulse_la_DEPENDENCIES) $(EXTRA_pulse_la_DEPENDENCIES) 
-	$(pulse_la_LINK) $(am_pulse_la_rpath) $(pulse_la_OBJECTS) $(pulse_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(pulse_la_LINK) $(am_pulse_la_rpath) $(pulse_la_OBJECTS) $(pulse_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -463,25 +550,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pulse.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,26 +576,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +596,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +609,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -681,19 +768,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/pulse/pulse.c b/plugins/pulse/pulse.c
index 3315c13..09d4ab3 100644
--- a/plugins/pulse/pulse.c
+++ b/plugins/pulse/pulse.c
@@ -1,6 +1,8 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    PulseAudio output plugin for DeaDBeeF Player
+    Copyright (C) 2011 Jan D. Behrens <zykure at web.de>
+    Copyright (C) 2010-2012 Alexey Yakovenko <waker at users.sourceforge.net>
+    Copyright (C) 2010 Anton Novikov <tonn.post 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
@@ -14,9 +16,6 @@
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    PulseAudio output plugin
-    Copyright (C) 2010 Anton Novikov <tonn.post at gmail.com>
 */
 
 #ifdef HAVE_CONFIG_H
@@ -366,6 +365,7 @@ static DB_output_t plugin =
     .plugin.name = "PulseAudio output plugin",
     .plugin.descr = "At the moment of this writing, PulseAudio seems to be very unstable in many (or most) GNU/Linux distributions.\nIf you experience problems - please try switching to ALSA or OSS output.\nIf that doesn't help - please uninstall PulseAudio from your system, and try ALSA or OSS again.\nThanks for understanding",
     .plugin.copyright =
+        "PulseAudio output plugin for DeaDBeeF Player\n"
         "Copyright (C) 2011 Jan D. Behrens <zykure at web.de>\n"
         "Copyright (C) 2010-2012 Alexey Yakovenko <waker at users.sourceforge.net>\n"
         "Copyright (C) 2010 Anton Novikov <tonn.post at gmail.com>\n"
diff --git a/plugins/shellexec/COPYING b/plugins/shellexec/COPYING
new file mode 100644
index 0000000..80fa39c
--- /dev/null
+++ b/plugins/shellexec/COPYING
@@ -0,0 +1,19 @@
+Shellexec plugin for DeaDBeeF
+Copyright (C) 2010-2014 Deadbeef team
+Original developer Viktor Semykin <thesame.ml at gmail.com>
+Maintenance, minor improvements Alexey Yakovenko <waker at users.sf.net>
+GUI support and bugfixing Azeem Arshad <kr00r4n at gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
diff --git a/plugins/shellexec/Makefile.am b/plugins/shellexec/Makefile.am
index d38a08b..6aa7145 100644
--- a/plugins/shellexec/Makefile.am
+++ b/plugins/shellexec/Makefile.am
@@ -2,7 +2,7 @@ if HAVE_SHELLEXEC
 shxdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = shellexec.la
 shellexec_la_SOURCES = shellexec.c shellexec.h
-shellexec_la_LDFLAGS = -module
+shellexec_la_LDFLAGS = -module -avoid-version
 
 shellexec_la_LIBADD = $(LDADD)
 AM_CFLAGS = $(CFLAGS) -std=c99
diff --git a/plugins/shellexec/Makefile.in b/plugins/shellexec/Makefile.in
index e0996ea..5a860ba 100644
--- a/plugins/shellexec/Makefile.in
+++ b/plugins/shellexec/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/shellexec
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -113,23 +141,48 @@ shellexec_la_DEPENDENCIES =
 am__shellexec_la_SOURCES_DIST = shellexec.c shellexec.h
 @HAVE_SHELLEXEC_TRUE at am_shellexec_la_OBJECTS = shellexec.lo
 shellexec_la_OBJECTS = $(am_shellexec_la_OBJECTS)
-shellexec_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+shellexec_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(shellexec_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_SHELLEXEC_TRUE at am_shellexec_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(shellexec_la_SOURCES)
 DIST_SOURCES = $(am__shellexec_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -137,6 +190,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -163,6 +233,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -183,10 +254,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -209,6 +282,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -262,6 +336,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -280,6 +355,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -305,13 +382,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -320,7 +401,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -381,7 +464,7 @@ top_srcdir = @top_srcdir@
 @HAVE_SHELLEXEC_TRUE at shxdir = $(libdir)/$(PACKAGE)
 @HAVE_SHELLEXEC_TRUE at pkglib_LTLIBRARIES = shellexec.la
 @HAVE_SHELLEXEC_TRUE at shellexec_la_SOURCES = shellexec.c shellexec.h
- at HAVE_SHELLEXEC_TRUE@shellexec_la_LDFLAGS = -module
+ at HAVE_SHELLEXEC_TRUE@shellexec_la_LDFLAGS = -module -avoid-version
 @HAVE_SHELLEXEC_TRUE at shellexec_la_LIBADD = $(LDADD)
 @HAVE_SHELLEXEC_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
 all: all-am
@@ -418,6 +501,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -444,14 +528,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 shellexec.la: $(shellexec_la_OBJECTS) $(shellexec_la_DEPENDENCIES) $(EXTRA_shellexec_la_DEPENDENCIES) 
-	$(shellexec_la_LINK) $(am_shellexec_la_rpath) $(shellexec_la_OBJECTS) $(shellexec_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(shellexec_la_LINK) $(am_shellexec_la_rpath) $(shellexec_la_OBJECTS) $(shellexec_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -462,25 +549,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shellexec.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -488,26 +575,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -519,15 +595,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -536,6 +608,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -680,19 +767,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/shellexec/shellexec.c b/plugins/shellexec/shellexec.c
index 99bb471..e1e7f79 100644
--- a/plugins/shellexec/shellexec.c
+++ b/plugins/shellexec/shellexec.c
@@ -1,8 +1,8 @@
 /*
     Shellexec plugin for DeaDBeeF
-    Copyright (C) 2010-2012 Deadbeef team
+    Copyright (C) 2010-2014 Deadbeef team
     Original developer Viktor Semykin <thesame.ml at gmail.com>
-    Maintainance, minor improvements Alexey Yakovenko <waker at users.sf.net>
+    Maintenance, minor improvements Alexey Yakovenko <waker at users.sf.net>
     GUI support and bugfixing Azeem Arshad <kr00r4n at gmail.com>
 
     This program is free software: you can redistribute it and/or modify
@@ -88,8 +88,27 @@ static int shx_exec_track_cmd (Shx_action_t *action, DB_playItem_t *it) {
         return -1;
     }
     strcat (cmd, "&");
+
+    // replace \' with '"'"'
+    size_t l = strlen (cmd);
+    size_t remaining = _POSIX_ARG_MAX - l - 1;
+    for (int i = 0; cmd[i]; i++) {
+        if (cmd[i] == '\\' && cmd[i+1] == '\'' && remaining >= 3) {
+            memmove (&cmd[i+5], &cmd[i+2], l - i + 1 - 2);
+            memcpy (&cmd[i], "'\"'\"'", 5);
+            l += 3;
+            remaining -= 3;
+            i += 5;
+        }
+        else if (remaining < 3) {
+            fprintf (stderr, "shellexec: command is too long.\n");
+            return -1;
+        }
+    }
+
     trace ("%s\n", cmd);
     res = system (cmd);
+    return 0;
 }
 
 static int
@@ -442,9 +461,10 @@ static Shx_plugin_t plugin = {
     "this would show the name of selected track in notification popup"
     ,
     .misc.plugin.copyright = 
-        "Copyright (C) 2010-2012 Deadbeef team\n"
+        "Shellexec plugin for DeaDBeeF\n"
+        "Copyright (C) 2010-2014 Deadbeef team\n"
         "Original developer Viktor Semykin <thesame.ml at gmail.com>\n"
-        "Maintainance, minor improvements Alexey Yakovenko <waker at users.sf.net>\n"
+        "Maintenance, minor improvements Alexey Yakovenko <waker at users.sf.net>\n"
         "GUI support and bugfixing Azeem Arshad <kr00r4n at gmail.com>"
         "\n"
         "This program is free software; you can redistribute it and/or\n"
diff --git a/plugins/shellexecui/COPYING b/plugins/shellexecui/COPYING
new file mode 100644
index 0000000..fe3bb97
--- /dev/null
+++ b/plugins/shellexecui/COPYING
@@ -0,0 +1,18 @@
+ShellExec GUI plugin for DeaDBeeF Player
+Copyright (C) 2012 Azeem Arshad <kr00r4n at gmail.com>
+Copyright (C) 2013-2014 Alexey Yakovenko
+
+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.
+
diff --git a/plugins/shellexecui/Makefile.am b/plugins/shellexecui/Makefile.am
index e894513..22d84e5 100644
--- a/plugins/shellexecui/Makefile.am
+++ b/plugins/shellexecui/Makefile.am
@@ -18,11 +18,11 @@ AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
 
 if HAVE_GTK2
 shellexecui_gtk2_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h
-shellexecui_gtk2_la_LDFLAGS = -module
+shellexecui_gtk2_la_LDFLAGS = -module -avoid-version
 if STATICLINK
 GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr
 
-shellexecui_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la
+shellexecui_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lrt
 
 shellexecui_gtk2_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
 else
@@ -33,19 +33,10 @@ endif
 
 if HAVE_GTK3
 shellexecui_gtk3_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h
-shellexecui_gtk3_la_LDFLAGS = -module
-if STATICLINK
-GTK_ROOT_300=@top_srcdir@/$(LIB)/gtk-3.0.0
-
-shellexecui_gtk3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD)
-
-shellexecui_gtk3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS)
-
-else
+shellexecui_gtk3_la_LDFLAGS = -module -avoid-version
 shellexecui_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
 shellexecui_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
 endif
-endif
 
 
 endif
diff --git a/plugins/shellexecui/Makefile.in b/plugins/shellexecui/Makefile.in
index f5a542a..01aff3e 100644
--- a/plugins/shellexecui/Makefile.in
+++ b/plugins/shellexecui/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/shellexecui
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -111,17 +139,6 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_FALSE at shellexecui_gtk2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- at HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at shellexecui_gtk2_la_DEPENDENCIES = $(GTK_ROOT)/lib/libgtk-x11-2.0.la \
- at HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgdk-x11-2.0.la \
- at HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libpangoft2-1.0.la \
- at HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libpangocairo-1.0.la \
- at HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la \
- at HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libcairo.la \
- at HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libpango-1.0.la \
- at HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgobject-2.0.la \
- at HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgmodule-2.0.la \
- at HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgthread-2.0.la \
- at HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libglib-2.0.la
 am__shellexecui_gtk2_la_SOURCES_DIST = shellexecui.c interface.c \
 	support.c callbacks.c interface.h support.h callbacks.h
 @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE at am_shellexecui_gtk2_la_OBJECTS = shellexecui_gtk2_la-shellexecui.lo \
@@ -129,8 +146,12 @@ am__shellexecui_gtk2_la_SOURCES_DIST = shellexecui.c interface.c \
 @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@	shellexecui_gtk2_la-support.lo \
 @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@	shellexecui_gtk2_la-callbacks.lo
 shellexecui_gtk2_la_OBJECTS = $(am_shellexecui_gtk2_la_OBJECTS)
-shellexecui_gtk2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+shellexecui_gtk2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) \
 	$(shellexecui_gtk2_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@HAVE_SHELLEXECUI_TRUE at am_shellexecui_gtk2_la_rpath = -rpath \
@@ -138,7 +159,8 @@ shellexecui_gtk2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at am_shellexecui_gtk2_la_rpath =  \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@	-rpath \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@	$(pkglibdir)
- at HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_FALSE at shellexecui_gtk3_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ at HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk3_la_DEPENDENCIES =  \
+ at HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@	$(am__DEPENDENCIES_1)
 am__shellexecui_gtk3_la_SOURCES_DIST = shellexecui.c interface.c \
 	support.c callbacks.c interface.h support.h callbacks.h
 @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at am_shellexecui_gtk3_la_OBJECTS = shellexecui_gtk3_la-shellexecui.lo \
@@ -146,8 +168,8 @@ am__shellexecui_gtk3_la_SOURCES_DIST = shellexecui.c interface.c \
 @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@	shellexecui_gtk3_la-support.lo \
 @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@	shellexecui_gtk3_la-callbacks.lo
 shellexecui_gtk3_la_OBJECTS = $(am_shellexecui_gtk3_la_OBJECTS)
-shellexecui_gtk3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+shellexecui_gtk3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) \
 	$(shellexecui_gtk3_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at am_shellexecui_gtk3_la_rpath = -rpath \
@@ -155,19 +177,40 @@ shellexecui_gtk3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at am_shellexecui_gtk3_la_rpath =  \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@	-rpath \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@	$(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(shellexecui_gtk2_la_SOURCES) \
 	$(shellexecui_gtk3_la_SOURCES)
 DIST_SOURCES = $(am__shellexecui_gtk2_la_SOURCES_DIST) \
@@ -177,6 +220,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -203,6 +263,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -223,10 +284,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -249,6 +312,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -302,6 +366,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -320,6 +385,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -345,13 +412,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -360,7 +431,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -424,19 +497,16 @@ top_srcdir = @top_srcdir@
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at pkglib_LTLIBRARIES = shellexecui_gtk2.la shellexecui_gtk3.la
 @HAVE_SHELLEXECUI_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
 @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk2_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h
- at HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk2_la_LDFLAGS = -module
+ at HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk2_la_LDFLAGS = -module -avoid-version
 @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at GTK_ROOT = @top_srcdir@/$(LIB)/gtk-2.12.12/usr
 @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_FALSE at shellexecui_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS)
- at HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at shellexecui_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la
+ at HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at shellexecui_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lrt
 @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_FALSE at shellexecui_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS)
 @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at shellexecui_gtk2_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
 @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk3_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h
- at HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk3_la_LDFLAGS = -module
- at HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at GTK_ROOT_300 = @top_srcdir@/$(LIB)/gtk-3.0.0
- at HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_FALSE at shellexecui_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
- at HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at shellexecui_gtk3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD)
- at HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_FALSE at shellexecui_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
- at HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at shellexecui_gtk3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS)
+ at HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk3_la_LDFLAGS = -module -avoid-version
+ at HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
+ at HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
 all: all-am
 
 .SUFFIXES:
@@ -471,6 +541,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -497,16 +568,20 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 shellexecui_gtk2.la: $(shellexecui_gtk2_la_OBJECTS) $(shellexecui_gtk2_la_DEPENDENCIES) $(EXTRA_shellexecui_gtk2_la_DEPENDENCIES) 
-	$(shellexecui_gtk2_la_LINK) $(am_shellexecui_gtk2_la_rpath) $(shellexecui_gtk2_la_OBJECTS) $(shellexecui_gtk2_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(shellexecui_gtk2_la_LINK) $(am_shellexecui_gtk2_la_rpath) $(shellexecui_gtk2_la_OBJECTS) $(shellexecui_gtk2_la_LIBADD) $(LIBS)
+
 shellexecui_gtk3.la: $(shellexecui_gtk3_la_OBJECTS) $(shellexecui_gtk3_la_DEPENDENCIES) $(EXTRA_shellexecui_gtk3_la_DEPENDENCIES) 
-	$(shellexecui_gtk3_la_LINK) $(am_shellexecui_gtk3_la_rpath) $(shellexecui_gtk3_la_OBJECTS) $(shellexecui_gtk3_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(shellexecui_gtk3_la_LINK) $(am_shellexecui_gtk3_la_rpath) $(shellexecui_gtk3_la_OBJECTS) $(shellexecui_gtk3_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -524,81 +599,81 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shellexecui_gtk3_la-support.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 shellexecui_gtk2_la-shellexecui.lo: shellexecui.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-shellexecui.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-shellexecui.Tpo -c -o shellexecui_gtk2_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/shellexecui_gtk2_la-shellexecui.Tpo $(DEPDIR)/shellexecui_gtk2_la-shellexecui.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='shellexecui.c' object='shellexecui_gtk2_la-shellexecui.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-shellexecui.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-shellexecui.Tpo -c -o shellexecui_gtk2_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk2_la-shellexecui.Tpo $(DEPDIR)/shellexecui_gtk2_la-shellexecui.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shellexecui.c' object='shellexecui_gtk2_la-shellexecui.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
 
 shellexecui_gtk2_la-interface.lo: interface.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-interface.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-interface.Tpo -c -o shellexecui_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/shellexecui_gtk2_la-interface.Tpo $(DEPDIR)/shellexecui_gtk2_la-interface.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interface.c' object='shellexecui_gtk2_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-interface.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-interface.Tpo -c -o shellexecui_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk2_la-interface.Tpo $(DEPDIR)/shellexecui_gtk2_la-interface.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='interface.c' object='shellexecui_gtk2_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
 
 shellexecui_gtk2_la-support.lo: support.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-support.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-support.Tpo -c -o shellexecui_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/shellexecui_gtk2_la-support.Tpo $(DEPDIR)/shellexecui_gtk2_la-support.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='support.c' object='shellexecui_gtk2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-support.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-support.Tpo -c -o shellexecui_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk2_la-support.Tpo $(DEPDIR)/shellexecui_gtk2_la-support.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='support.c' object='shellexecui_gtk2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
 
 shellexecui_gtk2_la-callbacks.lo: callbacks.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-callbacks.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-callbacks.Tpo -c -o shellexecui_gtk2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/shellexecui_gtk2_la-callbacks.Tpo $(DEPDIR)/shellexecui_gtk2_la-callbacks.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='callbacks.c' object='shellexecui_gtk2_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-callbacks.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-callbacks.Tpo -c -o shellexecui_gtk2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk2_la-callbacks.Tpo $(DEPDIR)/shellexecui_gtk2_la-callbacks.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='callbacks.c' object='shellexecui_gtk2_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
 
 shellexecui_gtk3_la-shellexecui.lo: shellexecui.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-shellexecui.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-shellexecui.Tpo -c -o shellexecui_gtk3_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/shellexecui_gtk3_la-shellexecui.Tpo $(DEPDIR)/shellexecui_gtk3_la-shellexecui.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='shellexecui.c' object='shellexecui_gtk3_la-shellexecui.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-shellexecui.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-shellexecui.Tpo -c -o shellexecui_gtk3_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk3_la-shellexecui.Tpo $(DEPDIR)/shellexecui_gtk3_la-shellexecui.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shellexecui.c' object='shellexecui_gtk3_la-shellexecui.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
 
 shellexecui_gtk3_la-interface.lo: interface.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-interface.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-interface.Tpo -c -o shellexecui_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/shellexecui_gtk3_la-interface.Tpo $(DEPDIR)/shellexecui_gtk3_la-interface.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interface.c' object='shellexecui_gtk3_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-interface.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-interface.Tpo -c -o shellexecui_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk3_la-interface.Tpo $(DEPDIR)/shellexecui_gtk3_la-interface.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='interface.c' object='shellexecui_gtk3_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
 
 shellexecui_gtk3_la-support.lo: support.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-support.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-support.Tpo -c -o shellexecui_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/shellexecui_gtk3_la-support.Tpo $(DEPDIR)/shellexecui_gtk3_la-support.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='support.c' object='shellexecui_gtk3_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-support.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-support.Tpo -c -o shellexecui_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk3_la-support.Tpo $(DEPDIR)/shellexecui_gtk3_la-support.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='support.c' object='shellexecui_gtk3_la-support.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
 
 shellexecui_gtk3_la-callbacks.lo: callbacks.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-callbacks.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-callbacks.Tpo -c -o shellexecui_gtk3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/shellexecui_gtk3_la-callbacks.Tpo $(DEPDIR)/shellexecui_gtk3_la-callbacks.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='callbacks.c' object='shellexecui_gtk3_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-callbacks.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-callbacks.Tpo -c -o shellexecui_gtk3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk3_la-callbacks.Tpo $(DEPDIR)/shellexecui_gtk3_la-callbacks.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='callbacks.c' object='shellexecui_gtk3_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -606,26 +681,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -637,15 +701,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -654,6 +714,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -798,19 +873,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/shellexecui/callbacks.c b/plugins/shellexecui/callbacks.c
index b8fb56d..019fde9 100644
--- a/plugins/shellexecui/callbacks.c
+++ b/plugins/shellexecui/callbacks.c
@@ -8,4 +8,3 @@
 #include "interface.h"
 #include "support.h"
 
-
diff --git a/plugins/shellexecui/callbacks.h b/plugins/shellexecui/callbacks.h
index c4b5768..4b1f203 100644
--- a/plugins/shellexecui/callbacks.h
+++ b/plugins/shellexecui/callbacks.h
@@ -28,3 +28,7 @@ on_edit_cancel_button_clicked          (GtkButton       *button,
 void
 on_edit_ok_button_clicked              (GtkButton       *button,
                                         gpointer         user_data);
+
+void
+on_shellexec_conf_dialog_destroy       (GObject       *object,
+                                        gpointer         user_data);
diff --git a/plugins/shellexecui/interface.c b/plugins/shellexecui/interface.c
index d00c0fc..6296617 100644
--- a/plugins/shellexecui/interface.c
+++ b/plugins/shellexecui/interface.c
@@ -44,6 +44,7 @@ create_shellexec_conf_dialog (void)
   shellexec_conf_dialog = gtk_dialog_new ();
   gtk_container_set_border_width (GTK_CONTAINER (shellexec_conf_dialog), 12);
   gtk_window_set_title (GTK_WINDOW (shellexec_conf_dialog), _("Custom Shell Commands"));
+  gtk_window_set_destroy_with_parent (GTK_WINDOW (shellexec_conf_dialog), TRUE);
   gtk_window_set_type_hint (GTK_WINDOW (shellexec_conf_dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
   gtk_dialog_set_has_separator (GTK_DIALOG (shellexec_conf_dialog), FALSE);
 
@@ -89,6 +90,9 @@ create_shellexec_conf_dialog (void)
   gtk_dialog_add_action_widget (GTK_DIALOG (shellexec_conf_dialog), save_button, 0);
   gtk_widget_set_can_default(save_button, TRUE);
 
+  g_signal_connect ((gpointer) shellexec_conf_dialog, "destroy",
+                    G_CALLBACK (on_shellexec_conf_dialog_destroy),
+                    NULL);
   g_signal_connect ((gpointer) add_button, "clicked",
                     G_CALLBACK (on_add_button_clicked),
                     NULL);
diff --git a/plugins/shellexecui/shellexec.glade b/plugins/shellexecui/shellexec.glade
index aea894a..aa87216 100644
--- a/plugins/shellexecui/shellexec.glade
+++ b/plugins/shellexecui/shellexec.glade
@@ -11,7 +11,7 @@
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
   <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
+  <property name="destroy_with_parent">True</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -20,6 +20,7 @@
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
+  <signal name="destroy" handler="on_shellexec_conf_dialog_destroy" last_modification_time="Fri, 27 Jun 2014 18:45:21 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox">
diff --git a/plugins/shellexecui/shellexecui.c b/plugins/shellexecui/shellexecui.c
index 5dda649..6b6744d 100644
--- a/plugins/shellexecui/shellexecui.c
+++ b/plugins/shellexecui/shellexecui.c
@@ -1,5 +1,7 @@
 /*
+    ShellExec GUI plugin for DeaDBeeF Player
     Copyright (C) 2012 Azeem Arshad <kr00r4n at gmail.com>
+    Copyright (C) 2013-2014 Alexey Yakovenko
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
@@ -343,9 +345,20 @@ init_treeview() {
     g_object_unref(liststore);
 }
 
+void
+on_shellexec_conf_dialog_destroy       (GObject       *object,
+                                        gpointer         user_data)
+{
+    conf_dlg = NULL;
+}
+
+
 static gboolean
 shellexecui_action_gtk (void *data)
 {
+    if (conf_dlg) {
+        return FALSE;
+    }
     conf_dlg = create_shellexec_conf_dialog();
     gtk_widget_set_size_request (conf_dlg, 400, 400);
     gtk_window_set_transient_for(GTK_WINDOW(conf_dlg),
@@ -362,7 +375,7 @@ shellexecui_action_callback(DB_plugin_action_t *action, int ctx) {
 }
 
 static DB_plugin_action_t shellexecui_action = {
-    .title = "Edit/Configure custom shell commands",
+    .title = "Edit/Configure Custom Shell Commands",
     .name = "shellexec_conf",
     .flags = DB_ACTION_COMMON | DB_ACTION_ADD_MENU,
     .callback2 = shellexecui_action_callback,
@@ -408,7 +421,9 @@ static DB_misc_t plugin = {
 #endif
     .plugin.descr = "A GTK UI for the Shellexec plugin",
     .plugin.copyright = 
+        "ShellExec GUI plugin for DeaDBeeF Player\n"
         "Copyright (C) 2012 Azeem Arshad <kr00r4n at gmail.com>\n"
+        "Copyright (C) 2013-2014 Alexey Yakovenko\n"
         "\n"
         "This program is free software; you can redistribute it and/or\n"
         "modify it under the terms of the GNU General Public License\n"
diff --git a/plugins/shn/COPYING b/plugins/shn/COPYING
new file mode 100644
index 0000000..6c3100f
--- /dev/null
+++ b/plugins/shn/COPYING
@@ -0,0 +1,28 @@
+SHN (Shorten) plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
+
+Based on xmms-shn, http://www.etree.org/shnutils/xmms-shn/
+Copyright (C) 2000-2007  Jason Jordan <shnutils at freeshell.org>
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+For Shorten license, please see LICENCE.shorten
+Modifications for DeaDBeeF (C) 2009-2014 Alexey Yakovenko
diff --git a/plugins/shn/Makefile.am b/plugins/shn/Makefile.am
index acc597e..297da84 100644
--- a/plugins/shn/Makefile.am
+++ b/plugins/shn/Makefile.am
@@ -3,7 +3,7 @@ shndir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = ddb_shn.la
 ddb_shn_la_SOURCES = array.c convert.c misc.c output.c seek.c shn.c shn.h shorten.c shorten.h sulawalaw.c vario.c wave.c bitshift.h
 
-ddb_shn_la_LDFLAGS = -module
+ddb_shn_la_LDFLAGS = -module -avoid-version
 
 ddb_shn_la_LIBADD = $(LDADD) -lm
 AM_CFLAGS = $(CFLAGS) -std=c99
diff --git a/plugins/shn/Makefile.in b/plugins/shn/Makefile.in
index 8882b46..c1233d9 100644
--- a/plugins/shn/Makefile.in
+++ b/plugins/shn/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,8 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/shn
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	AUTHORS
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp AUTHORS COPYING README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -118,23 +145,48 @@ am__ddb_shn_la_SOURCES_DIST = array.c convert.c misc.c output.c seek.c \
 @HAVE_SHN_TRUE@	output.lo seek.lo shn.lo shorten.lo \
 @HAVE_SHN_TRUE@	sulawalaw.lo vario.lo wave.lo
 ddb_shn_la_OBJECTS = $(am_ddb_shn_la_OBJECTS)
-ddb_shn_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+ddb_shn_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(ddb_shn_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_SHN_TRUE at am_ddb_shn_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(ddb_shn_la_SOURCES)
 DIST_SOURCES = $(am__ddb_shn_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -142,6 +194,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -168,6 +237,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -188,10 +258,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -214,6 +286,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -267,6 +340,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -285,6 +359,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -310,13 +386,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -325,7 +405,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -386,7 +468,7 @@ top_srcdir = @top_srcdir@
 @HAVE_SHN_TRUE at shndir = $(libdir)/$(PACKAGE)
 @HAVE_SHN_TRUE at pkglib_LTLIBRARIES = ddb_shn.la
 @HAVE_SHN_TRUE at ddb_shn_la_SOURCES = array.c convert.c misc.c output.c seek.c shn.c shn.h shorten.c shorten.h sulawalaw.c vario.c wave.c bitshift.h
- at HAVE_SHN_TRUE@ddb_shn_la_LDFLAGS = -module
+ at HAVE_SHN_TRUE@ddb_shn_la_LDFLAGS = -module -avoid-version
 @HAVE_SHN_TRUE at ddb_shn_la_LIBADD = $(LDADD) -lm
 @HAVE_SHN_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
 all: all-am
@@ -423,6 +505,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -449,14 +532,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 ddb_shn.la: $(ddb_shn_la_OBJECTS) $(ddb_shn_la_DEPENDENCIES) $(EXTRA_ddb_shn_la_DEPENDENCIES) 
-	$(ddb_shn_la_LINK) $(am_ddb_shn_la_rpath) $(ddb_shn_la_OBJECTS) $(ddb_shn_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(ddb_shn_la_LINK) $(am_ddb_shn_la_rpath) $(ddb_shn_la_OBJECTS) $(ddb_shn_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -476,25 +562,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wave.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -502,26 +588,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -533,15 +608,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -550,6 +621,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -694,19 +780,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/shn/shn.c b/plugins/shn/shn.c
index a8b773a..cfc14fb 100644
--- a/plugins/shn/shn.c
+++ b/plugins/shn/shn.c
@@ -1,20 +1,27 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+    SHN (Shorten) plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
+
+    Based on xmms-shn, http://www.etree.org/shnutils/xmms-shn/
+    Copyright (C) 2000-2007  Jason Jordan <shnutils at freeshell.org>
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
 
 // based on xmms-shn, http://www.etree.org/shnutils/xmms-shn/
@@ -1809,24 +1816,29 @@ static DB_decoder_t plugin = {
     .plugin.name = "Shorten player",
     .plugin.descr = "decodes shn files",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "SHN (Shorten) plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>\n"
         "\n"
         "Based on xmms-shn, http://www.etree.org/shnutils/xmms-shn/\n"
         "Copyright (C) 2000-2007  Jason Jordan <shnutils at freeshell.org>\n"
         "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "This software is provided 'as-is', without any express or implied\n"
+        "warranty.  In no event will the authors be held liable for any damages\n"
+        "arising from the use of this software.\n"
+        "\n"
+        "Permission is granted to anyone to use this software for any purpose,\n"
+        "including commercial applications, and to alter it and redistribute it\n"
+        "freely, subject to the following restrictions:\n"
+        "\n"
+        "1. The origin of this software must not be misrepresented; you must not\n"
+        " claim that you wrote the original software. If you use this software\n"
+        " in a product, an acknowledgment in the product documentation would be\n"
+        " appreciated but is not required.\n"
         "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
+        "2. Altered source versions must be plainly marked as such, and must not be\n"
+        " misrepresented as being the original software.\n"
         "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "3. This notice may not be removed or altered from any source distribution.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .plugin.configdialog = settings_dlg,
diff --git a/plugins/sid/COPYING b/plugins/sid/COPYING
new file mode 100644
index 0000000..82ad294
--- /dev/null
+++ b/plugins/sid/COPYING
@@ -0,0 +1,20 @@
+SID plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+
+Uses libsidplay2 with modifications.
+The modifications (C) 2009-2014 Alexey Yakovenko.
diff --git a/plugins/sid/Makefile.am b/plugins/sid/Makefile.am
index 992dc37..690834c 100644
--- a/plugins/sid/Makefile.am
+++ b/plugins/sid/Makefile.am
@@ -103,7 +103,7 @@ sidplay-libs/libsidplay/src/kernal.bin\
 sidplay-libs/libsidplay/src/psiddrv.bin\
 sidplay-libs/libsidplay/src/poweron.bin
 	
-sid_la_LDFLAGS = -module $(NOCPPLIB)
+sid_la_LDFLAGS = -module -avoid-version $(NOCPPLIB)
 
 AM_CFLAGS = $(CFLAGS) -std=c99 -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include -fPIC
 AM_CPPFLAGS = $(CXXFLAGS) -DHAVE_UNIX -I$(sidpath) -I$(sidpath)/unix -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include -DHAVE_STRCASECMP -DHAVE_STRNCASECMP -fno-exceptions -fno-rtti -fno-unwind-tables
diff --git a/plugins/sid/Makefile.in b/plugins/sid/Makefile.in
index c6c2be0..cf1c5c1 100644
--- a/plugins/sid/Makefile.in
+++ b/plugins/sid/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/sid
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -210,32 +238,66 @@ am__sid_la_SOURCES_DIST = plugin.c csid.cpp csid.h \
 @HAVE_SID_TRUE@	envelope.lo voice.lo sid.lo wave8580__ST.lo \
 @HAVE_SID_TRUE@	wave8580_P_T.lo reloc65.lo
 sid_la_OBJECTS = $(am_sid_la_OBJECTS)
-sid_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(sid_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+sid_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(sid_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_SID_TRUE at am_sid_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_ at AM_V@)
+am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(sid_la_SOURCES)
 DIST_SOURCES = $(am__sid_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -243,6 +305,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -269,6 +348,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -289,10 +369,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -315,6 +397,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -368,6 +451,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -386,6 +470,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -411,13 +497,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -426,7 +516,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -588,7 +680,7 @@ top_srcdir = @top_srcdir@
 @HAVE_SID_TRUE at sidplay-libs/libsidplay/src/psiddrv.bin\
 @HAVE_SID_TRUE at sidplay-libs/libsidplay/src/poweron.bin
 
- at HAVE_SID_TRUE@sid_la_LDFLAGS = -module $(NOCPPLIB)
+ at HAVE_SID_TRUE@sid_la_LDFLAGS = -module -avoid-version $(NOCPPLIB)
 @HAVE_SID_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include -fPIC
 @HAVE_SID_TRUE at AM_CPPFLAGS = $(CXXFLAGS) -DHAVE_UNIX -I$(sidpath) -I$(sidpath)/unix -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include -DHAVE_STRCASECMP -DHAVE_STRNCASECMP -fno-exceptions -fno-rtti -fno-unwind-tables
 all: all-am
@@ -625,6 +717,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -651,14 +744,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 sid.la: $(sid_la_OBJECTS) $(sid_la_DEPENDENCIES) $(EXTRA_sid_la_DEPENDENCIES) 
-	$(sid_la_LINK) $(am_sid_la_rpath) $(sid_la_OBJECTS) $(sid_la_LIBADD) $(LIBS)
+	$(AM_V_CXXLD)$(sid_la_LINK) $(am_sid_la_rpath) $(sid_la_OBJECTS) $(sid_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -707,305 +803,305 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xsid.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 reloc65.lo: sidplay-libs/libsidplay/src/reloc65.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reloc65.lo -MD -MP -MF $(DEPDIR)/reloc65.Tpo -c -o reloc65.lo `test -f 'sidplay-libs/libsidplay/src/reloc65.c' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/reloc65.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/reloc65.Tpo $(DEPDIR)/reloc65.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sidplay-libs/libsidplay/src/reloc65.c' object='reloc65.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reloc65.lo -MD -MP -MF $(DEPDIR)/reloc65.Tpo -c -o reloc65.lo `test -f 'sidplay-libs/libsidplay/src/reloc65.c' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/reloc65.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/reloc65.Tpo $(DEPDIR)/reloc65.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sidplay-libs/libsidplay/src/reloc65.c' object='reloc65.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reloc65.lo `test -f 'sidplay-libs/libsidplay/src/reloc65.c' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/reloc65.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reloc65.lo `test -f 'sidplay-libs/libsidplay/src/reloc65.c' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/reloc65.c
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mixer.lo: sidplay-libs/libsidplay/src/mixer.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mixer.lo -MD -MP -MF $(DEPDIR)/mixer.Tpo -c -o mixer.lo `test -f 'sidplay-libs/libsidplay/src/mixer.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mixer.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mixer.Tpo $(DEPDIR)/mixer.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/mixer.cpp' object='mixer.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mixer.lo -MD -MP -MF $(DEPDIR)/mixer.Tpo -c -o mixer.lo `test -f 'sidplay-libs/libsidplay/src/mixer.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mixer.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mixer.Tpo $(DEPDIR)/mixer.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/mixer.cpp' object='mixer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mixer.lo `test -f 'sidplay-libs/libsidplay/src/mixer.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mixer.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mixer.lo `test -f 'sidplay-libs/libsidplay/src/mixer.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mixer.cpp
 
 player.lo: sidplay-libs/libsidplay/src/player.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT player.lo -MD -MP -MF $(DEPDIR)/player.Tpo -c -o player.lo `test -f 'sidplay-libs/libsidplay/src/player.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/player.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/player.Tpo $(DEPDIR)/player.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/player.cpp' object='player.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT player.lo -MD -MP -MF $(DEPDIR)/player.Tpo -c -o player.lo `test -f 'sidplay-libs/libsidplay/src/player.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/player.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/player.Tpo $(DEPDIR)/player.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/player.cpp' object='player.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.lo `test -f 'sidplay-libs/libsidplay/src/player.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/player.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.lo `test -f 'sidplay-libs/libsidplay/src/player.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/player.cpp
 
 mos656x.lo: sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos656x.lo -MD -MP -MF $(DEPDIR)/mos656x.Tpo -c -o mos656x.lo `test -f 'sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mos656x.Tpo $(DEPDIR)/mos656x.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' object='mos656x.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos656x.lo -MD -MP -MF $(DEPDIR)/mos656x.Tpo -c -o mos656x.lo `test -f 'sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mos656x.Tpo $(DEPDIR)/mos656x.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' object='mos656x.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos656x.lo `test -f 'sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos656x.lo `test -f 'sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
 
 mos6510.lo: sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos6510.lo -MD -MP -MF $(DEPDIR)/mos6510.Tpo -c -o mos6510.lo `test -f 'sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mos6510.Tpo $(DEPDIR)/mos6510.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' object='mos6510.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos6510.lo -MD -MP -MF $(DEPDIR)/mos6510.Tpo -c -o mos6510.lo `test -f 'sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mos6510.Tpo $(DEPDIR)/mos6510.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' object='mos6510.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos6510.lo `test -f 'sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos6510.lo `test -f 'sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
 
 sid6526.lo: sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sid6526.lo -MD -MP -MF $(DEPDIR)/sid6526.Tpo -c -o sid6526.lo `test -f 'sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/sid6526.Tpo $(DEPDIR)/sid6526.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' object='sid6526.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sid6526.lo -MD -MP -MF $(DEPDIR)/sid6526.Tpo -c -o sid6526.lo `test -f 'sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sid6526.Tpo $(DEPDIR)/sid6526.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' object='sid6526.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sid6526.lo `test -f 'sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sid6526.lo `test -f 'sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
 
 MUS.lo: sidplay-libs/libsidplay/src/sidtune/MUS.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MUS.lo -MD -MP -MF $(DEPDIR)/MUS.Tpo -c -o MUS.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/MUS.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/MUS.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/MUS.Tpo $(DEPDIR)/MUS.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidtune/MUS.cpp' object='MUS.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MUS.lo -MD -MP -MF $(DEPDIR)/MUS.Tpo -c -o MUS.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/MUS.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/MUS.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/MUS.Tpo $(DEPDIR)/MUS.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidtune/MUS.cpp' object='MUS.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MUS.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/MUS.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/MUS.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MUS.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/MUS.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/MUS.cpp
 
 SidTuneTools.lo: sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SidTuneTools.lo -MD -MP -MF $(DEPDIR)/SidTuneTools.Tpo -c -o SidTuneTools.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/SidTuneTools.Tpo $(DEPDIR)/SidTuneTools.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' object='SidTuneTools.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SidTuneTools.lo -MD -MP -MF $(DEPDIR)/SidTuneTools.Tpo -c -o SidTuneTools.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SidTuneTools.Tpo $(DEPDIR)/SidTuneTools.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' object='SidTuneTools.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SidTuneTools.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SidTuneTools.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
 
 InfoFile.lo: sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT InfoFile.lo -MD -MP -MF $(DEPDIR)/InfoFile.Tpo -c -o InfoFile.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/InfoFile.Tpo $(DEPDIR)/InfoFile.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' object='InfoFile.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT InfoFile.lo -MD -MP -MF $(DEPDIR)/InfoFile.Tpo -c -o InfoFile.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/InfoFile.Tpo $(DEPDIR)/InfoFile.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' object='InfoFile.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o InfoFile.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o InfoFile.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
 
 SidTune.lo: sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SidTune.lo -MD -MP -MF $(DEPDIR)/SidTune.Tpo -c -o SidTune.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/SidTune.Tpo $(DEPDIR)/SidTune.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' object='SidTune.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SidTune.lo -MD -MP -MF $(DEPDIR)/SidTune.Tpo -c -o SidTune.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SidTune.Tpo $(DEPDIR)/SidTune.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' object='SidTune.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SidTune.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SidTune.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
 
 PSID.lo: sidplay-libs/libsidplay/src/sidtune/PSID.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PSID.lo -MD -MP -MF $(DEPDIR)/PSID.Tpo -c -o PSID.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PSID.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PSID.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/PSID.Tpo $(DEPDIR)/PSID.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidtune/PSID.cpp' object='PSID.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PSID.lo -MD -MP -MF $(DEPDIR)/PSID.Tpo -c -o PSID.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PSID.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PSID.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/PSID.Tpo $(DEPDIR)/PSID.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidtune/PSID.cpp' object='PSID.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PSID.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PSID.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PSID.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PSID.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PSID.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PSID.cpp
 
 PP20.lo: sidplay-libs/libsidplay/src/sidtune/PP20.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PP20.lo -MD -MP -MF $(DEPDIR)/PP20.Tpo -c -o PP20.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PP20.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PP20.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/PP20.Tpo $(DEPDIR)/PP20.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidtune/PP20.cpp' object='PP20.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PP20.lo -MD -MP -MF $(DEPDIR)/PP20.Tpo -c -o PP20.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PP20.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PP20.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/PP20.Tpo $(DEPDIR)/PP20.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidtune/PP20.cpp' object='PP20.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PP20.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PP20.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PP20.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PP20.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PP20.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PP20.cpp
 
 IconInfo.lo: sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT IconInfo.lo -MD -MP -MF $(DEPDIR)/IconInfo.Tpo -c -o IconInfo.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/IconInfo.Tpo $(DEPDIR)/IconInfo.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' object='IconInfo.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT IconInfo.lo -MD -MP -MF $(DEPDIR)/IconInfo.Tpo -c -o IconInfo.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/IconInfo.Tpo $(DEPDIR)/IconInfo.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' object='IconInfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o IconInfo.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o IconInfo.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
 
 event.lo: sidplay-libs/libsidplay/src/event.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event.lo -MD -MP -MF $(DEPDIR)/event.Tpo -c -o event.lo `test -f 'sidplay-libs/libsidplay/src/event.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/event.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/event.Tpo $(DEPDIR)/event.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/event.cpp' object='event.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event.lo -MD -MP -MF $(DEPDIR)/event.Tpo -c -o event.lo `test -f 'sidplay-libs/libsidplay/src/event.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/event.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/event.Tpo $(DEPDIR)/event.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/event.cpp' object='event.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event.lo `test -f 'sidplay-libs/libsidplay/src/event.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/event.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event.lo `test -f 'sidplay-libs/libsidplay/src/event.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/event.cpp
 
 psiddrv.lo: sidplay-libs/libsidplay/src/psiddrv.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT psiddrv.lo -MD -MP -MF $(DEPDIR)/psiddrv.Tpo -c -o psiddrv.lo `test -f 'sidplay-libs/libsidplay/src/psiddrv.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/psiddrv.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/psiddrv.Tpo $(DEPDIR)/psiddrv.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/psiddrv.cpp' object='psiddrv.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT psiddrv.lo -MD -MP -MF $(DEPDIR)/psiddrv.Tpo -c -o psiddrv.lo `test -f 'sidplay-libs/libsidplay/src/psiddrv.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/psiddrv.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/psiddrv.Tpo $(DEPDIR)/psiddrv.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/psiddrv.cpp' object='psiddrv.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o psiddrv.lo `test -f 'sidplay-libs/libsidplay/src/psiddrv.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/psiddrv.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o psiddrv.lo `test -f 'sidplay-libs/libsidplay/src/psiddrv.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/psiddrv.cpp
 
 config.lo: sidplay-libs/libsidplay/src/config.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.lo -MD -MP -MF $(DEPDIR)/config.Tpo -c -o config.lo `test -f 'sidplay-libs/libsidplay/src/config.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/config.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/config.Tpo $(DEPDIR)/config.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/config.cpp' object='config.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.lo -MD -MP -MF $(DEPDIR)/config.Tpo -c -o config.lo `test -f 'sidplay-libs/libsidplay/src/config.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/config.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/config.Tpo $(DEPDIR)/config.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/config.cpp' object='config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.lo `test -f 'sidplay-libs/libsidplay/src/config.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/config.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.lo `test -f 'sidplay-libs/libsidplay/src/config.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/config.cpp
 
 sidplay2.lo: sidplay-libs/libsidplay/src/sidplay2.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sidplay2.lo -MD -MP -MF $(DEPDIR)/sidplay2.Tpo -c -o sidplay2.lo `test -f 'sidplay-libs/libsidplay/src/sidplay2.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidplay2.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/sidplay2.Tpo $(DEPDIR)/sidplay2.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidplay2.cpp' object='sidplay2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sidplay2.lo -MD -MP -MF $(DEPDIR)/sidplay2.Tpo -c -o sidplay2.lo `test -f 'sidplay-libs/libsidplay/src/sidplay2.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidplay2.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sidplay2.Tpo $(DEPDIR)/sidplay2.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidplay2.cpp' object='sidplay2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sidplay2.lo `test -f 'sidplay-libs/libsidplay/src/sidplay2.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidplay2.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sidplay2.lo `test -f 'sidplay-libs/libsidplay/src/sidplay2.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidplay2.cpp
 
 xsid.lo: sidplay-libs/libsidplay/src/xsid/xsid.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xsid.lo -MD -MP -MF $(DEPDIR)/xsid.Tpo -c -o xsid.lo `test -f 'sidplay-libs/libsidplay/src/xsid/xsid.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/xsid/xsid.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsid.Tpo $(DEPDIR)/xsid.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/xsid/xsid.cpp' object='xsid.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xsid.lo -MD -MP -MF $(DEPDIR)/xsid.Tpo -c -o xsid.lo `test -f 'sidplay-libs/libsidplay/src/xsid/xsid.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/xsid/xsid.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xsid.Tpo $(DEPDIR)/xsid.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/xsid/xsid.cpp' object='xsid.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xsid.lo `test -f 'sidplay-libs/libsidplay/src/xsid/xsid.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/xsid/xsid.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xsid.lo `test -f 'sidplay-libs/libsidplay/src/xsid/xsid.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/xsid/xsid.cpp
 
 mos6526.lo: sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos6526.lo -MD -MP -MF $(DEPDIR)/mos6526.Tpo -c -o mos6526.lo `test -f 'sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mos6526.Tpo $(DEPDIR)/mos6526.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' object='mos6526.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos6526.lo -MD -MP -MF $(DEPDIR)/mos6526.Tpo -c -o mos6526.lo `test -f 'sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mos6526.Tpo $(DEPDIR)/mos6526.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' object='mos6526.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos6526.lo `test -f 'sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos6526.lo `test -f 'sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
 
 resid.lo: sidplay-libs/builders/resid-builder/src/resid.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resid.lo -MD -MP -MF $(DEPDIR)/resid.Tpo -c -o resid.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/resid.Tpo $(DEPDIR)/resid.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/builders/resid-builder/src/resid.cpp' object='resid.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resid.lo -MD -MP -MF $(DEPDIR)/resid.Tpo -c -o resid.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/resid.Tpo $(DEPDIR)/resid.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/builders/resid-builder/src/resid.cpp' object='resid.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resid.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resid.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid.cpp
 
 resid-builder.lo: sidplay-libs/builders/resid-builder/src/resid-builder.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resid-builder.lo -MD -MP -MF $(DEPDIR)/resid-builder.Tpo -c -o resid-builder.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid-builder.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid-builder.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/resid-builder.Tpo $(DEPDIR)/resid-builder.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/builders/resid-builder/src/resid-builder.cpp' object='resid-builder.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resid-builder.lo -MD -MP -MF $(DEPDIR)/resid-builder.Tpo -c -o resid-builder.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid-builder.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid-builder.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/resid-builder.Tpo $(DEPDIR)/resid-builder.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/builders/resid-builder/src/resid-builder.cpp' object='resid-builder.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resid-builder.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid-builder.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid-builder.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resid-builder.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid-builder.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid-builder.cpp
 
 wave8580_PS_.lo: sidplay-libs/resid/wave8580_PS_.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_PS_.lo -MD -MP -MF $(DEPDIR)/wave8580_PS_.Tpo -c -o wave8580_PS_.lo `test -f 'sidplay-libs/resid/wave8580_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PS_.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave8580_PS_.Tpo $(DEPDIR)/wave8580_PS_.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave8580_PS_.cpp' object='wave8580_PS_.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_PS_.lo -MD -MP -MF $(DEPDIR)/wave8580_PS_.Tpo -c -o wave8580_PS_.lo `test -f 'sidplay-libs/resid/wave8580_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PS_.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave8580_PS_.Tpo $(DEPDIR)/wave8580_PS_.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/wave8580_PS_.cpp' object='wave8580_PS_.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_PS_.lo `test -f 'sidplay-libs/resid/wave8580_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PS_.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_PS_.lo `test -f 'sidplay-libs/resid/wave8580_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PS_.cpp
 
 filter.lo: sidplay-libs/resid/filter.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filter.lo -MD -MP -MF $(DEPDIR)/filter.Tpo -c -o filter.lo `test -f 'sidplay-libs/resid/filter.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/filter.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/filter.Tpo $(DEPDIR)/filter.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/filter.cpp' object='filter.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filter.lo -MD -MP -MF $(DEPDIR)/filter.Tpo -c -o filter.lo `test -f 'sidplay-libs/resid/filter.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/filter.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/filter.Tpo $(DEPDIR)/filter.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/filter.cpp' object='filter.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filter.lo `test -f 'sidplay-libs/resid/filter.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/filter.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filter.lo `test -f 'sidplay-libs/resid/filter.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/filter.cpp
 
 pot.lo: sidplay-libs/resid/pot.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pot.lo -MD -MP -MF $(DEPDIR)/pot.Tpo -c -o pot.lo `test -f 'sidplay-libs/resid/pot.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/pot.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/pot.Tpo $(DEPDIR)/pot.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/pot.cpp' object='pot.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pot.lo -MD -MP -MF $(DEPDIR)/pot.Tpo -c -o pot.lo `test -f 'sidplay-libs/resid/pot.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/pot.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pot.Tpo $(DEPDIR)/pot.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/pot.cpp' object='pot.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pot.lo `test -f 'sidplay-libs/resid/pot.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/pot.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pot.lo `test -f 'sidplay-libs/resid/pot.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/pot.cpp
 
 wave.lo: sidplay-libs/resid/wave.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave.lo -MD -MP -MF $(DEPDIR)/wave.Tpo -c -o wave.lo `test -f 'sidplay-libs/resid/wave.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave.Tpo $(DEPDIR)/wave.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave.cpp' object='wave.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave.lo -MD -MP -MF $(DEPDIR)/wave.Tpo -c -o wave.lo `test -f 'sidplay-libs/resid/wave.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave.Tpo $(DEPDIR)/wave.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/wave.cpp' object='wave.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave.lo `test -f 'sidplay-libs/resid/wave.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave.lo `test -f 'sidplay-libs/resid/wave.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave.cpp
 
 version.lo: sidplay-libs/resid/version.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT version.lo -MD -MP -MF $(DEPDIR)/version.Tpo -c -o version.lo `test -f 'sidplay-libs/resid/version.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/version.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/version.Tpo $(DEPDIR)/version.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/version.cpp' object='version.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT version.lo -MD -MP -MF $(DEPDIR)/version.Tpo -c -o version.lo `test -f 'sidplay-libs/resid/version.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/version.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/version.Tpo $(DEPDIR)/version.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/version.cpp' object='version.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o version.lo `test -f 'sidplay-libs/resid/version.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/version.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o version.lo `test -f 'sidplay-libs/resid/version.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/version.cpp
 
 wave6581__ST.lo: sidplay-libs/resid/wave6581__ST.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581__ST.lo -MD -MP -MF $(DEPDIR)/wave6581__ST.Tpo -c -o wave6581__ST.lo `test -f 'sidplay-libs/resid/wave6581__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581__ST.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave6581__ST.Tpo $(DEPDIR)/wave6581__ST.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave6581__ST.cpp' object='wave6581__ST.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581__ST.lo -MD -MP -MF $(DEPDIR)/wave6581__ST.Tpo -c -o wave6581__ST.lo `test -f 'sidplay-libs/resid/wave6581__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581__ST.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave6581__ST.Tpo $(DEPDIR)/wave6581__ST.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/wave6581__ST.cpp' object='wave6581__ST.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581__ST.lo `test -f 'sidplay-libs/resid/wave6581__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581__ST.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581__ST.lo `test -f 'sidplay-libs/resid/wave6581__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581__ST.cpp
 
 extfilt.lo: sidplay-libs/resid/extfilt.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT extfilt.lo -MD -MP -MF $(DEPDIR)/extfilt.Tpo -c -o extfilt.lo `test -f 'sidplay-libs/resid/extfilt.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/extfilt.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/extfilt.Tpo $(DEPDIR)/extfilt.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/extfilt.cpp' object='extfilt.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT extfilt.lo -MD -MP -MF $(DEPDIR)/extfilt.Tpo -c -o extfilt.lo `test -f 'sidplay-libs/resid/extfilt.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/extfilt.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/extfilt.Tpo $(DEPDIR)/extfilt.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/extfilt.cpp' object='extfilt.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o extfilt.lo `test -f 'sidplay-libs/resid/extfilt.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/extfilt.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o extfilt.lo `test -f 'sidplay-libs/resid/extfilt.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/extfilt.cpp
 
 wave8580_PST.lo: sidplay-libs/resid/wave8580_PST.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_PST.lo -MD -MP -MF $(DEPDIR)/wave8580_PST.Tpo -c -o wave8580_PST.lo `test -f 'sidplay-libs/resid/wave8580_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PST.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave8580_PST.Tpo $(DEPDIR)/wave8580_PST.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave8580_PST.cpp' object='wave8580_PST.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_PST.lo -MD -MP -MF $(DEPDIR)/wave8580_PST.Tpo -c -o wave8580_PST.lo `test -f 'sidplay-libs/resid/wave8580_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PST.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave8580_PST.Tpo $(DEPDIR)/wave8580_PST.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/wave8580_PST.cpp' object='wave8580_PST.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_PST.lo `test -f 'sidplay-libs/resid/wave8580_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PST.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_PST.lo `test -f 'sidplay-libs/resid/wave8580_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PST.cpp
 
 wave6581_PST.lo: sidplay-libs/resid/wave6581_PST.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_PST.lo -MD -MP -MF $(DEPDIR)/wave6581_PST.Tpo -c -o wave6581_PST.lo `test -f 'sidplay-libs/resid/wave6581_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PST.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave6581_PST.Tpo $(DEPDIR)/wave6581_PST.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave6581_PST.cpp' object='wave6581_PST.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_PST.lo -MD -MP -MF $(DEPDIR)/wave6581_PST.Tpo -c -o wave6581_PST.lo `test -f 'sidplay-libs/resid/wave6581_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PST.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave6581_PST.Tpo $(DEPDIR)/wave6581_PST.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/wave6581_PST.cpp' object='wave6581_PST.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_PST.lo `test -f 'sidplay-libs/resid/wave6581_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PST.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_PST.lo `test -f 'sidplay-libs/resid/wave6581_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PST.cpp
 
 wave6581_P_T.lo: sidplay-libs/resid/wave6581_P_T.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_P_T.lo -MD -MP -MF $(DEPDIR)/wave6581_P_T.Tpo -c -o wave6581_P_T.lo `test -f 'sidplay-libs/resid/wave6581_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_P_T.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave6581_P_T.Tpo $(DEPDIR)/wave6581_P_T.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave6581_P_T.cpp' object='wave6581_P_T.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_P_T.lo -MD -MP -MF $(DEPDIR)/wave6581_P_T.Tpo -c -o wave6581_P_T.lo `test -f 'sidplay-libs/resid/wave6581_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_P_T.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave6581_P_T.Tpo $(DEPDIR)/wave6581_P_T.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/wave6581_P_T.cpp' object='wave6581_P_T.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_P_T.lo `test -f 'sidplay-libs/resid/wave6581_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_P_T.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_P_T.lo `test -f 'sidplay-libs/resid/wave6581_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_P_T.cpp
 
 wave6581_PS_.lo: sidplay-libs/resid/wave6581_PS_.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_PS_.lo -MD -MP -MF $(DEPDIR)/wave6581_PS_.Tpo -c -o wave6581_PS_.lo `test -f 'sidplay-libs/resid/wave6581_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PS_.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave6581_PS_.Tpo $(DEPDIR)/wave6581_PS_.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave6581_PS_.cpp' object='wave6581_PS_.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_PS_.lo -MD -MP -MF $(DEPDIR)/wave6581_PS_.Tpo -c -o wave6581_PS_.lo `test -f 'sidplay-libs/resid/wave6581_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PS_.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave6581_PS_.Tpo $(DEPDIR)/wave6581_PS_.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/wave6581_PS_.cpp' object='wave6581_PS_.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_PS_.lo `test -f 'sidplay-libs/resid/wave6581_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PS_.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_PS_.lo `test -f 'sidplay-libs/resid/wave6581_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PS_.cpp
 
 envelope.lo: sidplay-libs/resid/envelope.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT envelope.lo -MD -MP -MF $(DEPDIR)/envelope.Tpo -c -o envelope.lo `test -f 'sidplay-libs/resid/envelope.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/envelope.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/envelope.Tpo $(DEPDIR)/envelope.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/envelope.cpp' object='envelope.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT envelope.lo -MD -MP -MF $(DEPDIR)/envelope.Tpo -c -o envelope.lo `test -f 'sidplay-libs/resid/envelope.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/envelope.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/envelope.Tpo $(DEPDIR)/envelope.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/envelope.cpp' object='envelope.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o envelope.lo `test -f 'sidplay-libs/resid/envelope.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/envelope.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o envelope.lo `test -f 'sidplay-libs/resid/envelope.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/envelope.cpp
 
 voice.lo: sidplay-libs/resid/voice.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT voice.lo -MD -MP -MF $(DEPDIR)/voice.Tpo -c -o voice.lo `test -f 'sidplay-libs/resid/voice.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/voice.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/voice.Tpo $(DEPDIR)/voice.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/voice.cpp' object='voice.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT voice.lo -MD -MP -MF $(DEPDIR)/voice.Tpo -c -o voice.lo `test -f 'sidplay-libs/resid/voice.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/voice.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/voice.Tpo $(DEPDIR)/voice.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/voice.cpp' object='voice.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o voice.lo `test -f 'sidplay-libs/resid/voice.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/voice.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o voice.lo `test -f 'sidplay-libs/resid/voice.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/voice.cpp
 
 sid.lo: sidplay-libs/resid/sid.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sid.lo -MD -MP -MF $(DEPDIR)/sid.Tpo -c -o sid.lo `test -f 'sidplay-libs/resid/sid.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/sid.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/sid.Tpo $(DEPDIR)/sid.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/sid.cpp' object='sid.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sid.lo -MD -MP -MF $(DEPDIR)/sid.Tpo -c -o sid.lo `test -f 'sidplay-libs/resid/sid.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/sid.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sid.Tpo $(DEPDIR)/sid.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/sid.cpp' object='sid.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sid.lo `test -f 'sidplay-libs/resid/sid.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/sid.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sid.lo `test -f 'sidplay-libs/resid/sid.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/sid.cpp
 
 wave8580__ST.lo: sidplay-libs/resid/wave8580__ST.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580__ST.lo -MD -MP -MF $(DEPDIR)/wave8580__ST.Tpo -c -o wave8580__ST.lo `test -f 'sidplay-libs/resid/wave8580__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580__ST.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave8580__ST.Tpo $(DEPDIR)/wave8580__ST.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave8580__ST.cpp' object='wave8580__ST.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580__ST.lo -MD -MP -MF $(DEPDIR)/wave8580__ST.Tpo -c -o wave8580__ST.lo `test -f 'sidplay-libs/resid/wave8580__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580__ST.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave8580__ST.Tpo $(DEPDIR)/wave8580__ST.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/wave8580__ST.cpp' object='wave8580__ST.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580__ST.lo `test -f 'sidplay-libs/resid/wave8580__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580__ST.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580__ST.lo `test -f 'sidplay-libs/resid/wave8580__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580__ST.cpp
 
 wave8580_P_T.lo: sidplay-libs/resid/wave8580_P_T.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_P_T.lo -MD -MP -MF $(DEPDIR)/wave8580_P_T.Tpo -c -o wave8580_P_T.lo `test -f 'sidplay-libs/resid/wave8580_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_P_T.cpp
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave8580_P_T.Tpo $(DEPDIR)/wave8580_P_T.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave8580_P_T.cpp' object='wave8580_P_T.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_P_T.lo -MD -MP -MF $(DEPDIR)/wave8580_P_T.Tpo -c -o wave8580_P_T.lo `test -f 'sidplay-libs/resid/wave8580_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_P_T.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave8580_P_T.Tpo $(DEPDIR)/wave8580_P_T.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='sidplay-libs/resid/wave8580_P_T.cpp' object='wave8580_P_T.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_P_T.lo `test -f 'sidplay-libs/resid/wave8580_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_P_T.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_P_T.lo `test -f 'sidplay-libs/resid/wave8580_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_P_T.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1013,26 +1109,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1044,15 +1129,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1061,6 +1142,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1205,19 +1301,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/sid/csid.cpp b/plugins/sid/csid.cpp
index af258f3..f2442f6 100644
--- a/plugins/sid/csid.cpp
+++ b/plugins/sid/csid.cpp
@@ -1,6 +1,6 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    SID plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -30,20 +30,6 @@
 #include "../../deadbeef.h"
 #include "csid.h"
 
-#ifndef ANDROID
-int _Unwind_Resume_or_Rethrow;
-int _Unwind_RaiseException;
-int _Unwind_GetLanguageSpecificData;
-int _Unwind_Resume;
-int _Unwind_DeleteException;
-int _Unwind_GetTextRelBase;
-int _Unwind_SetIP;
-int _Unwind_GetDataRelBase;
-int _Unwind_GetRegionStart;
-int _Unwind_SetGR;
-int _Unwind_GetIPInfo;
-#endif
-
 extern DB_decoder_t sid_plugin;
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
@@ -62,8 +48,6 @@ typedef struct {
     float duration; // of the current song
 } sid_info_t;
 
-static uint32_t csid_voicemask;
-
 static inline void
 le_int16 (int16_t in, unsigned char *out) {
     char *pin = (char *)∈
@@ -92,6 +76,9 @@ static int sldb_loaded;
 static sldb_t *sldb;
 static int sldb_disable;
 
+static int chip_voices = 0xff;
+static int chip_voices_changed = 0;
+
 static void
 sldb_load()
 {
@@ -293,6 +280,20 @@ csid_open (uint32_t hints) {
     return _info;
 }
 
+static void
+csid_mute_voices (sid_info_t *info, int chip_voices) {
+    int maxsids = info->sidplay->info ().maxsids;
+    for (int k = 0; k < maxsids; k++) {
+        sidemu *emu = info->resid->getsidemu (k);
+        if (emu) {
+            for (int i = 0; i < 3; i++) {
+                bool mute = chip_voices & (1 << i) ? false : true;
+                emu->voice (i, mute ? 0x00 : 0xff, mute);
+            }
+        }
+    }
+}
+
 int
 csid_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
     sid_info_t *info = (sid_info_t *)_info;
@@ -342,16 +343,8 @@ csid_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
     _info->fmt.channelmask = _info->fmt.channels == 1 ? DDB_SPEAKER_FRONT_LEFT : (DDB_SPEAKER_FRONT_LEFT | DDB_SPEAKER_FRONT_RIGHT);
     _info->readpos = 0;
 
-    int maxsids = info->sidplay->info ().maxsids;
-    for (int k = 0; k < maxsids; k++) {
-        sidemu *emu = info->resid->getsidemu (k);
-        if (emu) {
-            for (int i = 0; i < 3; i++) {
-                bool mute = csid_voicemask & (1 << i) ? true : false;
-                emu->voice (i, mute ? 0x00 : 0xff, mute);
-            }
-        }
-    }
+    chip_voices = deadbeef->conf_get_int ("chip.voices", 0xff);
+    csid_mute_voices (info, chip_voices);
     return 0;
 }
 
@@ -373,6 +366,12 @@ csid_read (DB_fileinfo_t *_info, char *bytes, int size) {
         return 0;
     }
 
+    if (chip_voices_changed) {
+        chip_voices = deadbeef->conf_get_int ("chip.voices", 0xff);
+        chip_voices_changed = 0;
+        csid_mute_voices (info, chip_voices);
+    }
+
     int rd = info->sidplay->play (bytes, size);
 
     int samplesize = (_info->fmt.bps>>3) * _info->fmt.channels;
@@ -563,32 +562,6 @@ csid_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
     return after;
 }
 
-#if 0
-int
-csid_numvoices (DB_fileinfo_t *_info) {
-    return 3;
-}
-
-void
-csid_mutevoice (DB_fileinfo_t *_info, int voice, int mute) {
-    sid_info_t *info = (sid_info_t *)_info;
-    csid_voicemask &= ~ (1<<voice);
-    csid_voicemask |= ((mute ? 1 : 0) << voice);
-    if (info->resid) {
-        int maxsids = info->sidplay->info ().maxsids;
-        for (int k = 0; k < maxsids; k++) {
-            sidemu *emu = info->resid->getsidemu (k);
-            if (emu) {
-                for (int i = 0; i < 3; i++) {
-                    bool mute = csid_voicemask & (1 << i) ? true : false;
-                    emu->voice (i, mute ? 0x00 : 0xff, mute);
-                }
-            }
-        }
-    }
-}
-#endif
-
 static int
 sid_configchanged (void) {
     int conf_hvsc_enable = deadbeef->conf_get_int ("hvsc_enable", 0);
@@ -604,6 +577,10 @@ sid_configchanged (void) {
         sldb_loaded = 0;
     }
 
+    if (chip_voices != deadbeef->conf_get_int ("chip.voices", 0xff)) {
+        chip_voices_changed = 1;
+    }
+
     return 0;
 }
 
diff --git a/plugins/sid/csid.h b/plugins/sid/csid.h
index 005fa2f..67c092d 100644
--- a/plugins/sid/csid.h
+++ b/plugins/sid/csid.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software: you can redistribute it and/or modify
diff --git a/plugins/sid/plugin.c b/plugins/sid/plugin.c
index 2b33876..03ea81c 100644
--- a/plugins/sid/plugin.c
+++ b/plugins/sid/plugin.c
@@ -1,6 +1,6 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    SID plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -38,16 +38,13 @@ DB_decoder_t sid_plugin = {
     .plugin.id = "sidplay2",
     .plugin.descr = "SID player based on libsidplay2",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "SID plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>\n"
         "\n"
-        "Uses modified libsidplay2-2.1.0\n"
-        "Commodore 64 SID emulation library\n"
-        "Copyright (C) Simon White and other authors\n"
-        "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "This program is free software: you can redistribute it and/or modify\n"
+        "it under the terms of the GNU General Public License as published by\n"
+        "the Free Software Foundation, either version 2 of the License, or\n"
+        "(at your option) any later version.\n"
         "\n"
         "This program is distributed in the hope that it will be useful,\n"
         "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -55,8 +52,7 @@ DB_decoder_t sid_plugin = {
         "GNU General Public License for more details.\n"
         "\n"
         "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .plugin.start = csid_start,
diff --git a/plugins/sndfile/COPYING b/plugins/sndfile/COPYING
new file mode 100644
index 0000000..2e978c0
--- /dev/null
+++ b/plugins/sndfile/COPYING
@@ -0,0 +1,35 @@
+libsndfile plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+
+
+libsndfile
+Copyright (C) 1999-2010 Erik de Castro Lopo <erikd at mega-nerd.com>
+
+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.
+
+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.
+
+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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/plugins/sndfile/Makefile.am b/plugins/sndfile/Makefile.am
index d5c7c9a..10aca7e 100644
--- a/plugins/sndfile/Makefile.am
+++ b/plugins/sndfile/Makefile.am
@@ -2,8 +2,8 @@ if HAVE_SNDFILE
 sndfiledir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = sndfile.la
 sndfile_la_SOURCES = sndfile.c
-sndfile_la_LDFLAGS = -module
+sndfile_la_LDFLAGS = -module -avoid-version
 
 sndfile_la_LIBADD = $(LDADD) $(SNDFILE_LIBS)
-AM_CFLAGS = $(CFLAGS) -std=c99
+AM_CFLAGS = $(CFLAGS) $(WAVPACK_CFLAGS) -std=c99
 endif
diff --git a/plugins/sndfile/Makefile.in b/plugins/sndfile/Makefile.in
index 3e35a7a..df6aaa8 100644
--- a/plugins/sndfile/Makefile.in
+++ b/plugins/sndfile/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/sndfile
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -114,23 +142,48 @@ am__DEPENDENCIES_1 =
 am__sndfile_la_SOURCES_DIST = sndfile.c
 @HAVE_SNDFILE_TRUE at am_sndfile_la_OBJECTS = sndfile.lo
 sndfile_la_OBJECTS = $(am_sndfile_la_OBJECTS)
-sndfile_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+sndfile_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(sndfile_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_SNDFILE_TRUE at am_sndfile_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(sndfile_la_SOURCES)
 DIST_SOURCES = $(am__sndfile_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,6 +191,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,6 +234,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -184,10 +255,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -210,6 +283,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -263,6 +337,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -281,6 +356,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -306,13 +383,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -321,7 +402,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -382,9 +465,9 @@ top_srcdir = @top_srcdir@
 @HAVE_SNDFILE_TRUE at sndfiledir = $(libdir)/$(PACKAGE)
 @HAVE_SNDFILE_TRUE at pkglib_LTLIBRARIES = sndfile.la
 @HAVE_SNDFILE_TRUE at sndfile_la_SOURCES = sndfile.c
- at HAVE_SNDFILE_TRUE@sndfile_la_LDFLAGS = -module
+ at HAVE_SNDFILE_TRUE@sndfile_la_LDFLAGS = -module -avoid-version
 @HAVE_SNDFILE_TRUE at sndfile_la_LIBADD = $(LDADD) $(SNDFILE_LIBS)
- at HAVE_SNDFILE_TRUE@AM_CFLAGS = $(CFLAGS) -std=c99
+ at HAVE_SNDFILE_TRUE@AM_CFLAGS = $(CFLAGS) $(WAVPACK_CFLAGS) -std=c99
 all: all-am
 
 .SUFFIXES:
@@ -419,6 +502,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -445,14 +529,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 sndfile.la: $(sndfile_la_OBJECTS) $(sndfile_la_DEPENDENCIES) $(EXTRA_sndfile_la_DEPENDENCIES) 
-	$(sndfile_la_LINK) $(am_sndfile_la_rpath) $(sndfile_la_OBJECTS) $(sndfile_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(sndfile_la_LINK) $(am_sndfile_la_rpath) $(sndfile_la_OBJECTS) $(sndfile_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -463,25 +550,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sndfile.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,26 +576,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +596,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +609,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -681,19 +768,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/sndfile/sndfile.c b/plugins/sndfile/sndfile.c
index 4ec9cb3..2cf5931 100644
--- a/plugins/sndfile/sndfile.c
+++ b/plugins/sndfile/sndfile.c
@@ -1,6 +1,6 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    libsndfile plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
@@ -582,7 +582,8 @@ static DB_decoder_t plugin = {
     .plugin.name = "WAV/PCM player",
     .plugin.descr = "wav/aiff player using libsndfile",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "libsndfile plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>\n"
         "\n"
         "This program is free software; you can redistribute it and/or\n"
         "modify it under the terms of the GNU General Public License\n"
diff --git a/plugins/supereq/COPYING b/plugins/supereq/COPYING
new file mode 100644
index 0000000..31da0ae
--- /dev/null
+++ b/plugins/supereq/COPYING
@@ -0,0 +1,20 @@
+SuperEQ DSP plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+
+
+For additional credits, please see dsp_supereq.txt
diff --git a/plugins/supereq/Equ.cpp b/plugins/supereq/Equ.cpp
index 49413ab..aea1d2b 100644
--- a/plugins/supereq/Equ.cpp
+++ b/plugins/supereq/Equ.cpp
@@ -1,6 +1,6 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    SuperEQ DSP plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
     Original SuperEQ code (C) Naoki Shibata <shibatch at users.sf.net>
 
     This program is free software; you can redistribute it and/or
@@ -24,18 +24,6 @@
 #include "paramlist.hpp"
 #include "Equ.h"
 
-int _Unwind_Resume_or_Rethrow;
-int _Unwind_RaiseException;
-int _Unwind_GetLanguageSpecificData;
-int _Unwind_Resume;
-int _Unwind_DeleteException;
-int _Unwind_GetTextRelBase;
-int _Unwind_SetIP;
-int _Unwind_GetDataRelBase;
-int _Unwind_GetRegionStart;
-int _Unwind_SetGR;
-int _Unwind_GetIPInfo;
-
 #ifdef USE_OOURA
 extern "C" void rdft(int, int, REAL *, int *, REAL *);
 void rfft(int n,int isign,REAL *x)
diff --git a/plugins/supereq/Equ.h b/plugins/supereq/Equ.h
index f67f7aa..2d34b73 100644
--- a/plugins/supereq/Equ.h
+++ b/plugins/supereq/Equ.h
@@ -1,5 +1,5 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+    DeaDBeeF - The Ultimate Music Player
     Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/supereq/Makefile.am b/plugins/supereq/Makefile.am
index 86abe30..e78c979 100644
--- a/plugins/supereq/Makefile.am
+++ b/plugins/supereq/Makefile.am
@@ -4,9 +4,9 @@ pkglib_LTLIBRARIES = supereq.la
 supereq_la_SOURCES = supereq.c Equ.cpp Equ.h Fftsg_fl.c paramlist.hpp
 
 AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_OOURA
-AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -nostdlib -fno-unwind-tables -DUSE_OOURA
+AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fno-unwind-tables -DUSE_OOURA
 
-supereq_la_LDFLAGS = -module $(NOCPPLIB)
+supereq_la_LDFLAGS = -module -avoid-version $(NOCPPLIB)
 
 supereq_la_LIBADD = $(LDADD)
 endif
diff --git a/plugins/supereq/Makefile.in b/plugins/supereq/Makefile.in
index 7acfbb1..4034244 100644
--- a/plugins/supereq/Makefile.in
+++ b/plugins/supereq/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/supereq
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -115,32 +143,66 @@ am__supereq_la_SOURCES_DIST = supereq.c Equ.cpp Equ.h Fftsg_fl.c \
 @HAVE_SUPEREQ_TRUE at am_supereq_la_OBJECTS = supereq.lo Equ.lo \
 @HAVE_SUPEREQ_TRUE@	Fftsg_fl.lo
 supereq_la_OBJECTS = $(am_supereq_la_OBJECTS)
-supereq_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+supereq_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(supereq_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_SUPEREQ_TRUE at am_supereq_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_ at AM_V@)
+am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(supereq_la_SOURCES)
 DIST_SOURCES = $(am__supereq_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -148,6 +210,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -174,6 +253,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -194,10 +274,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -220,6 +302,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -273,6 +356,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -291,6 +375,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -316,13 +402,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -331,7 +421,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -393,8 +485,8 @@ top_srcdir = @top_srcdir@
 @HAVE_SUPEREQ_TRUE at pkglib_LTLIBRARIES = supereq.la
 @HAVE_SUPEREQ_TRUE at supereq_la_SOURCES = supereq.c Equ.cpp Equ.h Fftsg_fl.c paramlist.hpp
 @HAVE_SUPEREQ_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_OOURA
- at HAVE_SUPEREQ_TRUE@AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -nostdlib -fno-unwind-tables -DUSE_OOURA
- at HAVE_SUPEREQ_TRUE@supereq_la_LDFLAGS = -module $(NOCPPLIB)
+ at HAVE_SUPEREQ_TRUE@AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fno-unwind-tables -DUSE_OOURA
+ at HAVE_SUPEREQ_TRUE@supereq_la_LDFLAGS = -module -avoid-version $(NOCPPLIB)
 @HAVE_SUPEREQ_TRUE at supereq_la_LIBADD = $(LDADD)
 all: all-am
 
@@ -430,6 +522,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -456,14 +549,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 supereq.la: $(supereq_la_OBJECTS) $(supereq_la_DEPENDENCIES) $(EXTRA_supereq_la_DEPENDENCIES) 
-	$(supereq_la_LINK) $(am_supereq_la_rpath) $(supereq_la_OBJECTS) $(supereq_la_LIBADD) $(LIBS)
+	$(AM_V_CXXLD)$(supereq_la_LINK) $(am_supereq_la_rpath) $(supereq_la_OBJECTS) $(supereq_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -476,46 +572,46 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/supereq.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
- at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -523,26 +619,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -554,15 +639,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -571,6 +652,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -715,19 +811,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/supereq/paramlist.hpp b/plugins/supereq/paramlist.hpp
index 9c5b09c..d761aaf 100644
--- a/plugins/supereq/paramlist.hpp
+++ b/plugins/supereq/paramlist.hpp
@@ -1,6 +1,6 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2011 Alexey Yakovenko <waker at users.sourceforge.net>
+    SuperEQ DSP plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
     Original SuperEQ code (C) Naoki Shibata <shibatch at users.sf.net>
 
     This program is free software; you can redistribute it and/or
diff --git a/plugins/supereq/supereq.c b/plugins/supereq/supereq.c
index 957da5a..e701a94 100644
--- a/plugins/supereq/supereq.c
+++ b/plugins/supereq/supereq.c
@@ -1,6 +1,6 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    SuperEQ DSP plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
@@ -282,7 +282,8 @@ static DB_dsp_t plugin = {
     .plugin.name = "SuperEQ",
     .plugin.descr = "equalizer plugin using SuperEQ library",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "SuperEQ DSP plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko <waker at users.sourceforge.net>\n"
         "\n"
         "Uses supereq library by Naoki Shibata, http://shibatch.sourceforge.net\n"
         "Uses FFT library by Takuya Ooura, http://www.kurims.kyoto-u.ac.jp/~ooura/\n"
@@ -300,6 +301,39 @@ static DB_dsp_t plugin = {
         "You should have received a copy of the GNU General Public License\n"
         "along with this program; if not, write to the Free Software\n"
         "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "\n"
+        "\n"
+        "\n"
+        "Based on:\n"
+        "Shibatch Super Equalizer ver 0.03 for winamp\n"
+        "written by Naoki Shibata  shibatch at users.sourceforge.net\n"
+        "\n"
+        "Shibatch Super Equalizer is a graphic and parametric equalizer plugin\n"
+        "for winamp. This plugin uses 16383th order FIR filter with FFT algorithm.\n"
+        "It's equalization is very precise. Equalization setting can be done\n"
+        "for each channel separately.\n"
+        "\n"
+        "Processes of internal equalizer in winamp are actually done by each\n"
+        "input plugin, so the results may differ for each input plugin.\n"
+        "With this plugin, this problem can be avoided.\n"
+        "\n"
+        "This plugin is optimized for processors which have cache equal to or\n"
+        "greater than 128k bytes(16383*2*sizeof(float) = 128k). This plugin\n"
+        "won't work efficiently with K6 series processors(buy Athlon!!!).\n"
+        "\n"
+        "Do not forget pressing \"preview\" button after changing setting.\n"
+        "\n"
+        "http://shibatch.sourceforge.net/\n"
+        "\n"
+        "***\n"
+        "\n"
+        "  This program(except FFT part) is distributed under LGPL. See LGPL.txt for\n"
+        "details.\n"
+        "\n"
+        "  FFT part is a routine made by Mr.Ooura. This routine is a freeware. Contact\n"
+        "Mr.Ooura for details of distributing licenses.\n"
+        "\n"
+        "http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .plugin.start = supereq_plugin_start,
diff --git a/plugins/tta/COPYING b/plugins/tta/COPYING
new file mode 100644
index 0000000..5c01c3a
--- /dev/null
+++ b/plugins/tta/COPYING
@@ -0,0 +1,53 @@
+TTA plugin for DeaDBeeF
+Copyright (C) 2009-2014 Alexey Yakovenko
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+TTAv1 decoder library for HW players
+Developed by: Alexander Djourik <ald at true-audio.com>
+              Pavel Zhilin <pzh at true-audio.com>
+
+Copyright (c) 2004 True Audio Software. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the True Audio Software nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/plugins/tta/Makefile.am b/plugins/tta/Makefile.am
index e8b319d..aba05c0 100644
--- a/plugins/tta/Makefile.am
+++ b/plugins/tta/Makefile.am
@@ -7,7 +7,7 @@ pkglib_LTLIBRARIES = tta.la
 
 tta_la_SOURCES = ttaplug.c filter.h ttadec.c ttadec.h
 
-tta_la_LDFLAGS = -module
+tta_la_LDFLAGS = -module -avoid-version
 
 AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
 endif
diff --git a/plugins/tta/Makefile.in b/plugins/tta/Makefile.in
index adf5ae7..279c500 100644
--- a/plugins/tta/Makefile.in
+++ b/plugins/tta/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/tta
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -113,23 +141,48 @@ tta_la_LIBADD =
 am__tta_la_SOURCES_DIST = ttaplug.c filter.h ttadec.c ttadec.h
 @HAVE_TTA_TRUE at am_tta_la_OBJECTS = ttaplug.lo ttadec.lo
 tta_la_OBJECTS = $(am_tta_la_OBJECTS)
-tta_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(tta_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+tta_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(tta_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_TTA_TRUE at am_tta_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(tta_la_SOURCES)
 DIST_SOURCES = $(am__tta_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -137,6 +190,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -163,6 +233,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -183,10 +254,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -209,6 +282,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -262,6 +336,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -280,6 +355,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -305,13 +382,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -320,7 +401,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -382,7 +465,7 @@ top_srcdir = @top_srcdir@
 @HAVE_TTA_TRUE at EXTRA_DIST = $(ttapath)/README
 @HAVE_TTA_TRUE at pkglib_LTLIBRARIES = tta.la
 @HAVE_TTA_TRUE at tta_la_SOURCES = ttaplug.c filter.h ttadec.c ttadec.h
- at HAVE_TTA_TRUE@tta_la_LDFLAGS = -module
+ at HAVE_TTA_TRUE@tta_la_LDFLAGS = -module -avoid-version
 @HAVE_TTA_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
 all: all-am
 
@@ -418,6 +501,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -444,14 +528,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 tta.la: $(tta_la_OBJECTS) $(tta_la_DEPENDENCIES) $(EXTRA_tta_la_DEPENDENCIES) 
-	$(tta_la_LINK) $(am_tta_la_rpath) $(tta_la_OBJECTS) $(tta_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(tta_la_LINK) $(am_tta_la_rpath) $(tta_la_OBJECTS) $(tta_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -463,25 +550,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ttaplug.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,26 +576,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +596,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +609,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -681,19 +768,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/tta/ttaplug.c b/plugins/tta/ttaplug.c
index ba6fac9..8ce2f77 100644
--- a/plugins/tta/ttaplug.c
+++ b/plugins/tta/ttaplug.c
@@ -1,20 +1,29 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    TTA plugin for DeaDBeeF
+    Copyright (C) 2009-2014 Alexey Yakovenko
 
-    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.
+    Based on TTAv1 decoder library for HW players
+    Copyright (c) 2004 True Audio Software. All rights reserved.
 
-    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 software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
+
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -331,24 +340,29 @@ static DB_decoder_t plugin = {
     .plugin.name = "tta decoder",
     .plugin.descr = "tta decoder based on TTA Hardware Players Library Version 1.2",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "TTA plugin for DeaDBeeF\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+        "\n"
+        "Based on TTAv1 decoder library for HW players\n"
+        "Copyright (c) 2004 True Audio Software. All rights reserved.\n"
+        "\n"
+        "This software is provided 'as-is', without any express or implied\n"
+        "warranty.  In no event will the authors be held liable for any damages\n"
+        "arising from the use of this software.\n"
         "\n"
-        "Uses modified TTA Hardware Players Library Version 1.2,\n"
-        "(c) 2004 Alexander Djourik. All rights reserved.\n"
+        "Permission is granted to anyone to use this software for any purpose,\n"
+        "including commercial applications, and to alter it and redistribute it\n"
+        "freely, subject to the following restrictions:\n"
         "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "1. The origin of this software must not be misrepresented; you must not\n"
+        " claim that you wrote the original software. If you use this software\n"
+        " in a product, an acknowledgment in the product documentation would be\n"
+        " appreciated but is not required.\n"
         "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
+        "2. Altered source versions must be plainly marked as such, and must not be\n"
+        " misrepresented as being the original software.\n"
         "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "3. This notice may not be removed or altered from any source distribution.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .plugin.start = tta_start,
diff --git a/plugins/vfs_curl/COPYING b/plugins/vfs_curl/COPYING
new file mode 100644
index 0000000..8f96d44
--- /dev/null
+++ b/plugins/vfs_curl/COPYING
@@ -0,0 +1,41 @@
+CURL VFS plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+                                 _   _ ____  _
+ Project                     ___| | | |  _ \| |
+                            / __| | | | |_) | |
+                           | (__| |_| |  _ <| |___
+                            \___|\___/|_| \_\_____|
+
+Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel at haxx.se>, et al.
+
+This software is licensed as described in the file COPYING, which
+you should have received as part of this distribution. The terms
+are also available at http://curl.haxx.se/docs/copyright.html.
+
+You may opt to use, copy, modify, merge, publish, distribute and/or sell
+copies of the Software, and permit persons to whom the Software is
+furnished to do so, under the terms of the COPYING file.
+
+This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+KIND, either express or implied.
diff --git a/plugins/vfs_curl/Makefile.am b/plugins/vfs_curl/Makefile.am
index 4c69c51..47f3930 100644
--- a/plugins/vfs_curl/Makefile.am
+++ b/plugins/vfs_curl/Makefile.am
@@ -2,8 +2,8 @@ if HAVE_VFS_CURL
 vfs_curldir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = vfs_curl.la
 vfs_curl_la_SOURCES = vfs_curl.c
-vfs_curl_la_LDFLAGS = -module
+vfs_curl_la_LDFLAGS = -module -avoid-version
 
 vfs_curl_la_LIBADD = $(LDADD) $(VFS_CURL_LIBS)
-AM_CFLAGS = $(CFLAGS) -std=c99
+AM_CFLAGS = $(CFLAGS) $(VFS_CURL_CFLAGS) -std=c99
 endif
diff --git a/plugins/vfs_curl/Makefile.in b/plugins/vfs_curl/Makefile.in
index 6a20de0..72d38e7 100644
--- a/plugins/vfs_curl/Makefile.in
+++ b/plugins/vfs_curl/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/vfs_curl
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -114,23 +142,48 @@ am__DEPENDENCIES_1 =
 am__vfs_curl_la_SOURCES_DIST = vfs_curl.c
 @HAVE_VFS_CURL_TRUE at am_vfs_curl_la_OBJECTS = vfs_curl.lo
 vfs_curl_la_OBJECTS = $(am_vfs_curl_la_OBJECTS)
-vfs_curl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+vfs_curl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(vfs_curl_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_VFS_CURL_TRUE at am_vfs_curl_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(vfs_curl_la_SOURCES)
 DIST_SOURCES = $(am__vfs_curl_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,6 +191,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,6 +234,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -184,10 +255,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -210,6 +283,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -263,6 +337,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -281,6 +356,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -306,13 +383,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -321,7 +402,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -382,9 +465,9 @@ top_srcdir = @top_srcdir@
 @HAVE_VFS_CURL_TRUE at vfs_curldir = $(libdir)/$(PACKAGE)
 @HAVE_VFS_CURL_TRUE at pkglib_LTLIBRARIES = vfs_curl.la
 @HAVE_VFS_CURL_TRUE at vfs_curl_la_SOURCES = vfs_curl.c
- at HAVE_VFS_CURL_TRUE@vfs_curl_la_LDFLAGS = -module
+ at HAVE_VFS_CURL_TRUE@vfs_curl_la_LDFLAGS = -module -avoid-version
 @HAVE_VFS_CURL_TRUE at vfs_curl_la_LIBADD = $(LDADD) $(VFS_CURL_LIBS)
- at HAVE_VFS_CURL_TRUE@AM_CFLAGS = $(CFLAGS) -std=c99
+ at HAVE_VFS_CURL_TRUE@AM_CFLAGS = $(CFLAGS) $(VFS_CURL_CFLAGS) -std=c99
 all: all-am
 
 .SUFFIXES:
@@ -419,6 +502,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -445,14 +529,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 vfs_curl.la: $(vfs_curl_la_OBJECTS) $(vfs_curl_la_DEPENDENCIES) $(EXTRA_vfs_curl_la_DEPENDENCIES) 
-	$(vfs_curl_la_LINK) $(am_vfs_curl_la_rpath) $(vfs_curl_la_OBJECTS) $(vfs_curl_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(vfs_curl_la_LINK) $(am_vfs_curl_la_rpath) $(vfs_curl_la_OBJECTS) $(vfs_curl_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -463,25 +550,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vfs_curl.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,26 +576,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +596,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +609,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -681,19 +768,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/vfs_curl/vfs_curl.c b/plugins/vfs_curl/vfs_curl.c
index c3ae253..f7a25e5 100644
--- a/plugins/vfs_curl/vfs_curl.c
+++ b/plugins/vfs_curl/vfs_curl.c
@@ -1,21 +1,26 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    CURL VFS plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko
 
-    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.
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
+
 #include <curl/curl.h>
 #include <string.h>
 #include <stdlib.h>
@@ -75,6 +80,9 @@ typedef struct {
 
     char http_err[CURL_ERROR_SIZE];
 
+    float prev_playtime;
+    time_t started_timestamp;
+
     // flags (bitfields to save some space)
     unsigned seektoend : 1; // indicates that next tell must return length
     unsigned gotheader : 1; // tells that all headers (including ICY) were processed (to start reading body)
@@ -205,6 +213,14 @@ http_parse_shoutcast_meta (HTTP_FILE *fp, const char *meta, int size) {
                 int songstarted = 0;
                 char *tit = strstr (title, " - ");
                 deadbeef->pl_lock ();
+                int emulate_trackchange = deadbeef->conf_get_int ("vfs_curl.emulate_trackchange", 0);
+                // create dummy track with previous meta
+                DB_playItem_t *from = NULL;
+                if (emulate_trackchange) {
+                    from = deadbeef->pl_item_alloc ();
+                    deadbeef->pl_items_copy_junk (fp->track, from, from);
+                }
+
                 if (tit) {
                     *tit = 0;
                     tit += 3;
@@ -224,6 +240,7 @@ http_parse_shoutcast_meta (HTTP_FILE *fp, const char *meta, int size) {
                 else {
                     const char *orig_title = deadbeef->pl_find_meta (fp->track, "title");
                     if (!orig_title || strcasecmp (orig_title, title)) {
+                        deadbeef->pl_delete_meta (fp->track, "artist");
                         vfs_curl_set_meta (fp->track, "title", title);
                         songstarted = 1;
                     }
@@ -236,12 +253,34 @@ http_parse_shoutcast_meta (HTTP_FILE *fp, const char *meta, int size) {
                 }
                 deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
                 if (songstarted) {
+
+                    float playpos = deadbeef->streamer_get_playpos ();
+                    if (emulate_trackchange)
+                    {
+                        ddb_event_trackchange_t *ev = (ddb_event_trackchange_t *)deadbeef->event_alloc (DB_EV_SONGCHANGED);
+
+                        ev->from = from;
+                        ev->to = fp->track;
+                        ev->playtime = playpos - fp->prev_playtime;
+                        ev->started_timestamp = fp->started_timestamp;
+                        deadbeef->pl_item_ref (ev->from);
+                        deadbeef->pl_item_ref (ev->to);
+                        deadbeef->event_send ((ddb_event_t *)ev, 0, 0);
+                    }
+
                     ddb_event_track_t *ev = (ddb_event_track_t *)deadbeef->event_alloc (DB_EV_SONGSTARTED);
                     ev->track = fp->track;
+                    fp->started_timestamp = time(NULL);
+                    ev->started_timestamp = fp->started_timestamp;
                     if (ev->track) {
                         deadbeef->pl_item_ref (ev->track);
                     }
                     deadbeef->event_send ((ddb_event_t *)ev, 0, 0);
+                    fp->prev_playtime = playpos;
+                }
+                if (from) {
+                    deadbeef->pl_item_unref (from);
+                    from = NULL;
                 }
             }
             return 0;
@@ -1089,7 +1128,10 @@ http_is_streaming (void) {
     return 1;
 }
 
-// standard stdio vfs
+static const char settings_dlg[] =
+    "property \"Emulate track change events (for scrobbling)\" checkbox vfs_curl.emulate_trackchange 0;\n"
+;
+
 static DB_vfs_t plugin = {
     .plugin.api_vmajor = 1,
     .plugin.api_vminor = 0,
@@ -1100,25 +1142,31 @@ static DB_vfs_t plugin = {
     .plugin.name = "cURL vfs",
     .plugin.descr = "http and ftp streaming module using libcurl, with ICY protocol support",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "CURL VFS plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+        "\n"
+        "This software is provided 'as-is', without any express or implied\n"
+        "warranty.  In no event will the authors be held liable for any damages\n"
+        "arising from the use of this software.\n"
+        "\n"
+        "Permission is granted to anyone to use this software for any purpose,\n"
+        "including commercial applications, and to alter it and redistribute it\n"
+        "freely, subject to the following restrictions:\n"
         "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "1. The origin of this software must not be misrepresented; you must not\n"
+        " claim that you wrote the original software. If you use this software\n"
+        " in a product, an acknowledgment in the product documentation would be\n"
+        " appreciated but is not required.\n"
         "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
+        "2. Altered source versions must be plainly marked as such, and must not be\n"
+        " misrepresented as being the original software.\n"
         "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "3. This notice may not be removed or altered from any source distribution.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .plugin.start = vfs_curl_start,
     .plugin.stop = vfs_curl_stop,
+    .plugin.configdialog = settings_dlg,
     .open = http_open,
     .set_track = http_set_track,
     .close = http_close,
diff --git a/plugins/vfs_zip/COPYING b/plugins/vfs_zip/COPYING
new file mode 100644
index 0000000..a4205cd
--- /dev/null
+++ b/plugins/vfs_zip/COPYING
@@ -0,0 +1,21 @@
+ZIP VFS plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
diff --git a/plugins/vfs_zip/Makefile.am b/plugins/vfs_zip/Makefile.am
index 8a03b68..579baf5 100644
--- a/plugins/vfs_zip/Makefile.am
+++ b/plugins/vfs_zip/Makefile.am
@@ -2,8 +2,8 @@ if HAVE_VFS_ZIP
 pkglib_LTLIBRARIES = vfs_zip.la
 vfs_zip_la_SOURCES = vfs_zip.c
 
-vfs_zip_la_LDFLAGS = -module
+vfs_zip_la_LDFLAGS = -module -avoid-version
 
 vfs_zip_la_LIBADD = $(LDADD) $(ZLIB_LIBS) $(ZIP_LIBS)
-AM_CFLAGS = $(CFLAGS) -std=c99
+AM_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) $(ZIP_CFLAGS) -std=c99
 endif
diff --git a/plugins/vfs_zip/Makefile.in b/plugins/vfs_zip/Makefile.in
index 27ea107..139b577 100644
--- a/plugins/vfs_zip/Makefile.in
+++ b/plugins/vfs_zip/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/vfs_zip
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -115,23 +143,48 @@ am__DEPENDENCIES_1 =
 am__vfs_zip_la_SOURCES_DIST = vfs_zip.c
 @HAVE_VFS_ZIP_TRUE at am_vfs_zip_la_OBJECTS = vfs_zip.lo
 vfs_zip_la_OBJECTS = $(am_vfs_zip_la_OBJECTS)
-vfs_zip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+vfs_zip_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(vfs_zip_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_VFS_ZIP_TRUE at am_vfs_zip_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(vfs_zip_la_SOURCES)
 DIST_SOURCES = $(am__vfs_zip_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -139,6 +192,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -165,6 +235,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -185,10 +256,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -211,6 +284,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -264,6 +338,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -282,6 +357,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -307,13 +384,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -322,7 +403,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -382,9 +465,9 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @HAVE_VFS_ZIP_TRUE at pkglib_LTLIBRARIES = vfs_zip.la
 @HAVE_VFS_ZIP_TRUE at vfs_zip_la_SOURCES = vfs_zip.c
- at HAVE_VFS_ZIP_TRUE@vfs_zip_la_LDFLAGS = -module
+ at HAVE_VFS_ZIP_TRUE@vfs_zip_la_LDFLAGS = -module -avoid-version
 @HAVE_VFS_ZIP_TRUE at vfs_zip_la_LIBADD = $(LDADD) $(ZLIB_LIBS) $(ZIP_LIBS)
- at HAVE_VFS_ZIP_TRUE@AM_CFLAGS = $(CFLAGS) -std=c99
+ at HAVE_VFS_ZIP_TRUE@AM_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) $(ZIP_CFLAGS) -std=c99
 all: all-am
 
 .SUFFIXES:
@@ -419,6 +502,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -445,14 +529,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 vfs_zip.la: $(vfs_zip_la_OBJECTS) $(vfs_zip_la_DEPENDENCIES) $(EXTRA_vfs_zip_la_DEPENDENCIES) 
-	$(vfs_zip_la_LINK) $(am_vfs_zip_la_rpath) $(vfs_zip_la_OBJECTS) $(vfs_zip_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(vfs_zip_la_LINK) $(am_vfs_zip_la_rpath) $(vfs_zip_la_OBJECTS) $(vfs_zip_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -463,25 +550,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vfs_zip.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,26 +576,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +596,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +609,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -681,19 +768,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/vfs_zip/vfs_zip.c b/plugins/vfs_zip/vfs_zip.c
index eddd1cd..b468ece 100644
--- a/plugins/vfs_zip/vfs_zip.c
+++ b/plugins/vfs_zip/vfs_zip.c
@@ -1,20 +1,24 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+    ZIP VFS plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
 
 #include <string.h>
@@ -26,11 +30,17 @@
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
+#define ENABLE_CACHE 1
+
 #define min(x,y) ((x)<(y)?(x):(y))
 
 static DB_functions_t *deadbeef;
 static DB_vfs_t plugin;
 
+#if ENABLE_CACHE
+#define ZIP_BUFFER_SIZE 8192
+#endif
+
 typedef struct {
     DB_FILE file;
     struct zip* z;
@@ -38,6 +48,12 @@ typedef struct {
     int64_t offset;
     int index;
     int64_t size;
+
+#if ENABLE_CACHE
+    uint8_t buffer[ZIP_BUFFER_SIZE];
+    int buffer_remaining;
+    int buffer_pos;
+#endif
 } zip_file_t;
 
 static const char *scheme_names[] = { "zip://", NULL };
@@ -55,6 +71,7 @@ vfs_zip_is_streaming (void) {
 // fname must have form of zip://full_filepath.zip:full_filepath_in_zip
 DB_FILE*
 vfs_zip_open (const char *fname) {
+    trace ("vfs_zip: open %s\n", fname);
     if (strncasecmp (fname, "zip://", 6)) {
         return NULL;
     }
@@ -98,11 +115,13 @@ vfs_zip_open (const char *fname) {
     f->zf = zf;
     f->index = st.index;
     f->size = st.size;
+    trace ("vfs_zip: end open %s\n", fname);
     return (DB_FILE*)f;
 }
 
 void
 vfs_zip_close (DB_FILE *f) {
+    trace ("vfs_zip: close\n");
     zip_file_t *zf = (zip_file_t *)f;
     if (zf->zf) {
         zip_fclose (zf->zf);
@@ -116,14 +135,40 @@ vfs_zip_close (DB_FILE *f) {
 size_t
 vfs_zip_read (void *ptr, size_t size, size_t nmemb, DB_FILE *f) {
     zip_file_t *zf = (zip_file_t *)f;
-    ssize_t rb = zip_fread (zf->zf, ptr, size * nmemb);
+//    printf ("read: %d\n", size*nmemb);
+
+    size_t sz = size * nmemb;
+#if ENABLE_CACHE
+    while (sz) {
+        if (zf->buffer_remaining == 0) {
+            zf->buffer_pos = 0;
+            int rb = zip_fread (zf->zf, zf->buffer, ZIP_BUFFER_SIZE);
+            if (rb <= 0) {
+                break;
+            }
+            zf->buffer_remaining = rb;
+        }
+        int from_buf = min (sz, zf->buffer_remaining);
+        memcpy (ptr, zf->buffer+zf->buffer_pos, from_buf);
+        zf->buffer_remaining -= from_buf;
+        zf->buffer_pos += from_buf;
+        zf->offset += from_buf;
+        sz -= from_buf;
+        ptr += from_buf;
+    }
+#else
+    rb = zip_fread (zf->zf, ptr, sz);
+    sz -= rb;
     zf->offset += rb;
-    return rb / size;
+#endif
+
+    return (size * nmemb - sz) / size;
 }
 
 int
 vfs_zip_seek (DB_FILE *f, int64_t offset, int whence) {
     zip_file_t *zf = (zip_file_t *)f;
+//    printf ("seek: %lld (%d)\n", offset, whence);
 
     if (whence == SEEK_CUR) {
         offset = zf->offset + offset;
@@ -132,6 +177,38 @@ vfs_zip_seek (DB_FILE *f, int64_t offset, int whence) {
         offset = zf->size + offset;
     }
 
+#if ENABLE_CACHE
+    int64_t offs = offset - zf->offset;
+    if ((offs < 0 && -offs <= zf->buffer_pos) || (offs >= 0 && offs < zf->buffer_remaining)) {
+        if (offs != 0) {
+            //printf ("cache success\n");
+
+            //printf ("[before] absoffs: %lld, offs: %lld, rem: %d, pos: %d\n", offset, offs, zf->buffer_remaining, zf->buffer_pos);
+
+            // test cases:
+            // fail: offs = -3, pos = 0, rem = 100
+            // fail: offs = 10, pos = 95, rem = 5
+            // succ: offs = -3, pos = 3, rem = 97 ----> pos = 0, rem=100
+            // succ: offs = 10, pos = 0, rem = 100 ---> pos = 10, rem = 90
+
+            zf->buffer_pos += offs;
+            zf->buffer_remaining -= offs;
+            //printf ("[after] offs: %lld, rem: %d, pos: %d\n", offs, zf->buffer_remaining, zf->buffer_pos);
+            zf->offset = offset;
+            assert (zf->buffer_pos < ZIP_BUFFER_SIZE);
+            return 0;
+        }
+        else {
+//            printf ("cache double success\n");
+            return 0;
+        }
+    }
+//    else {
+//        printf ("cache miss: abs_offs: %lld, offs: %lld, rem: %d, pos: %d\n", offset, offs, zf->buffer_remaining, zf->buffer_pos);
+//    }
+
+    zf->offset += zf->buffer_remaining;
+#endif
     if (offset < zf->offset) {
         // reopen
         zip_fclose (zf->zf);
@@ -141,6 +218,10 @@ vfs_zip_seek (DB_FILE *f, int64_t offset, int whence) {
         }
         zf->offset = 0;
     }
+#if ENABLE_CACHE
+    zf->buffer_pos = 0;
+    zf->buffer_remaining = 0;
+#endif
     char buf[4096];
     int64_t n = offset - zf->offset;
     while (n > 0) {
@@ -172,6 +253,9 @@ vfs_zip_rewind (DB_FILE *f) {
     zf->zf = zip_fopen_index (zf->z, zf->index, 0);
     assert (zf->zf); // FIXME: better error handling?
     zf->offset = 0;
+#if ENABLE_CACHE
+    zf->buffer_remaining = 0;
+#endif
 }
 
 int64_t
@@ -196,10 +280,12 @@ vfs_zip_scandir (const char *dir, struct dirent ***namelist, int (*selector) (co
         (*namelist)[i] = malloc (sizeof (struct dirent));
         memset ((*namelist)[i], 0, sizeof (struct dirent));
         const char *nm = zip_get_name (z, i, 0);
-        snprintf ((*namelist)[i]->d_name, sizeof ((*namelist)[i]->d_name), "zip://%s:%s", dir, nm);
+        trace ("vfs_zip: %s\n", nm);
+        snprintf ((*namelist)[i]->d_name, sizeof ((*namelist)[i]->d_name), "%s", nm);
     }
 
     zip_close (z);
+    trace ("vfs_zip: scandir done\n");
     return n;
 }
 
@@ -211,10 +297,14 @@ vfs_zip_is_container (const char *fname) {
     }
     return 0;
 }
+const char *
+vfs_zip_get_scheme_for_name (const char *fname) {
+    return scheme_names[0];
+}
 
 static DB_vfs_t plugin = {
     .plugin.api_vmajor = 1,
-    .plugin.api_vminor = 0,
+    .plugin.api_vminor = 6,
     .plugin.version_major = 1,
     .plugin.version_minor = 0,
     .plugin.type = DB_PLUGIN_VFS,
@@ -222,21 +312,26 @@ static DB_vfs_t plugin = {
     .plugin.name = "ZIP vfs",
     .plugin.descr = "play files directly from zip files",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "ZIP VFS plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+        "\n"
+        "This software is provided 'as-is', without any express or implied\n"
+        "warranty.  In no event will the authors be held liable for any damages\n"
+        "arising from the use of this software.\n"
+        "\n"
+        "Permission is granted to anyone to use this software for any purpose,\n"
+        "including commercial applications, and to alter it and redistribute it\n"
+        "freely, subject to the following restrictions:\n"
         "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "1. The origin of this software must not be misrepresented; you must not\n"
+        " claim that you wrote the original software. If you use this software\n"
+        " in a product, an acknowledgment in the product documentation would be\n"
+        " appreciated but is not required.\n"
         "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
+        "2. Altered source versions must be plainly marked as such, and must not be\n"
+        " misrepresented as being the original software.\n"
         "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "3. This notice may not be removed or altered from any source distribution.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .open = vfs_zip_open,
@@ -250,6 +345,7 @@ static DB_vfs_t plugin = {
     .is_streaming = vfs_zip_is_streaming,
     .is_container = vfs_zip_is_container,
     .scandir = vfs_zip_scandir,
+    .get_scheme_for_name = vfs_zip_get_scheme_for_name,
 };
 
 DB_plugin_t *
diff --git a/plugins/vorbis/COPYING b/plugins/vorbis/COPYING
new file mode 100644
index 0000000..f076a6a
--- /dev/null
+++ b/plugins/vorbis/COPYING
@@ -0,0 +1,55 @@
+OggVorbis plugin for DeaDBeeF
+Copyright (C) 2009-2014 Alexey Yakovenko et al.
+
+vcedit.c - ogg tagging library
+Copyright (C) 2014 Ian Nartowicz <deadbeef at nartowicz.co.uk>
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+Uses libogg,libvorbis Copyright (c) 2002, Xiph.org Foundation
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the DeaDBeeF Player nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/plugins/vorbis/Makefile.am b/plugins/vorbis/Makefile.am
index 6580db1..8b09c68 100644
--- a/plugins/vorbis/Makefile.am
+++ b/plugins/vorbis/Makefile.am
@@ -1,9 +1,9 @@
 if HAVE_VORBIS
 vorbisdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = vorbis.la
-vorbis_la_SOURCES = vorbis.c vcedit.c vcedit.h vceditaux.h i18n.h
-vorbis_la_LDFLAGS = -module
+vorbis_la_SOURCES = vorbis.c
+vorbis_la_LDFLAGS = -module -avoid-version -lm -export-symbols-regex vorbis_load
 
-vorbis_la_LIBADD = $(LDADD) $(VORBIS_LIBS) -lc
-AM_CFLAGS = $(CFLAGS) -std=c99
+vorbis_la_LIBADD = $(LDADD) $(VORBIS_LIBS) ../liboggedit/liboggedit.a
+AM_CFLAGS = $(CFLAGS) $(VORBIS_CFLAGS) -std=c99
 endif
diff --git a/plugins/vorbis/Makefile.in b/plugins/vorbis/Makefile.in
index 368bd2c..a89237a 100644
--- a/plugins/vorbis/Makefile.in
+++ b/plugins/vorbis/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/vorbis
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -110,28 +138,53 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(pkglibdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
- at HAVE_VORBIS_TRUE@vorbis_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__vorbis_la_SOURCES_DIST = vorbis.c vcedit.c vcedit.h vceditaux.h \
-	i18n.h
- at HAVE_VORBIS_TRUE@am_vorbis_la_OBJECTS = vorbis.lo vcedit.lo
+ at HAVE_VORBIS_TRUE@vorbis_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ at HAVE_VORBIS_TRUE@	../liboggedit/liboggedit.a
+am__vorbis_la_SOURCES_DIST = vorbis.c
+ at HAVE_VORBIS_TRUE@am_vorbis_la_OBJECTS = vorbis.lo
 vorbis_la_OBJECTS = $(am_vorbis_la_OBJECTS)
-vorbis_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+vorbis_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(vorbis_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_VORBIS_TRUE at am_vorbis_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(vorbis_la_SOURCES)
 DIST_SOURCES = $(am__vorbis_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -139,6 +192,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -165,6 +235,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -185,10 +256,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -211,6 +284,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -264,6 +338,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -282,6 +357,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -307,13 +384,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -322,7 +403,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -382,10 +465,10 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @HAVE_VORBIS_TRUE at vorbisdir = $(libdir)/$(PACKAGE)
 @HAVE_VORBIS_TRUE at pkglib_LTLIBRARIES = vorbis.la
- at HAVE_VORBIS_TRUE@vorbis_la_SOURCES = vorbis.c vcedit.c vcedit.h vceditaux.h i18n.h
- at HAVE_VORBIS_TRUE@vorbis_la_LDFLAGS = -module
- at HAVE_VORBIS_TRUE@vorbis_la_LIBADD = $(LDADD) $(VORBIS_LIBS) -lc
- at HAVE_VORBIS_TRUE@AM_CFLAGS = $(CFLAGS) -std=c99
+ at HAVE_VORBIS_TRUE@vorbis_la_SOURCES = vorbis.c
+ at HAVE_VORBIS_TRUE@vorbis_la_LDFLAGS = -module -avoid-version -lm -export-symbols-regex vorbis_load
+ at HAVE_VORBIS_TRUE@vorbis_la_LIBADD = $(LDADD) $(VORBIS_LIBS) ../liboggedit/liboggedit.a
+ at HAVE_VORBIS_TRUE@AM_CFLAGS = $(CFLAGS) $(VORBIS_CFLAGS) -std=c99
 all: all-am
 
 .SUFFIXES:
@@ -420,6 +503,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -446,14 +530,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 vorbis.la: $(vorbis_la_OBJECTS) $(vorbis_la_DEPENDENCIES) $(EXTRA_vorbis_la_DEPENDENCIES) 
-	$(vorbis_la_LINK) $(am_vorbis_la_rpath) $(vorbis_la_OBJECTS) $(vorbis_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(vorbis_la_LINK) $(am_vorbis_la_rpath) $(vorbis_la_OBJECTS) $(vorbis_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -461,29 +548,28 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vcedit.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vorbis.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -491,26 +577,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -522,15 +597,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -539,6 +610,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -683,19 +769,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/vorbis/i18n.h b/plugins/vorbis/i18n.h
deleted file mode 100644
index 8624830..0000000
--- a/plugins/vorbis/i18n.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef VORBIS_TOOLS_I18N_H
-#define VORBIS_TOOLS_I18N_H
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(X) gettext(X)
-#else
-#define _(X) (X)
-#define textdomain(X)
-#define bindtextdomain(X, Y)
-#endif
-#ifdef gettext_noop
-#define N_(X) gettext_noop(X)
-#else
-#define N_(X) (X)
-#endif
-
-#endif
diff --git a/plugins/vorbis/vcedit.c b/plugins/vorbis/vcedit.c
deleted file mode 100644
index 2300b3d..0000000
--- a/plugins/vorbis/vcedit.c
+++ /dev/null
@@ -1,880 +0,0 @@
-/* This program is licensed under the GNU Library General Public License, version 2,
- * a copy of which is included with this program (LICENCE.LGPL).
- *
- * (c) 2000-2001 Michael Smith <msmith at xiph.org>
- *
- *
- * Comment editing backend, suitable for use by nice frontend interfaces.
- *
- * last modified: $Id: vcedit.c 16826 2010-01-27 04:16:24Z xiphmont $
- */
-
-/* Handle muxed streams and the Vorbis renormalization without having
- * to understand remuxing:
- * Linked list of buffers (buffer_chain).  Start a link and whenever
- * you encounter an unknown page from the current stream (ie we found
- * its bos in the bos section) push it onto the current buffer.  Whenever
- * you encounter the stream being renormalized create a new link in the
- * chain.
- * On writing, write the contents of the first link before every Vorbis
- * page written, and move to the next link.  Assuming the Vorbis pages
- * in match vorbis pages out, the order of pages from different logical
- * streams will be unchanged.
- * Special case: header. After writing the vorbis headers, and before
- * starting renormalization, flush accumulated links (takes care of
- * situations where number of secondary vorbis header pages changes due
- * to remuxing.  Similarly flush links at the end of renormalization
- * and before the start of the next chain is written.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <ogg/ogg.h>
-#include <vorbis/codec.h>
-
-#include "vcedit.h"
-#include "vceditaux.h"
-#include "i18n.h"
-
-#define CHUNKSIZE 4096
-#define BUFFERCHUNK CHUNKSIZE
-
-/* Helper function, shouldn't need to call directly */
-static int page_buffer_push(vcedit_buffer_chain *bufferlink, ogg_page *og) {
-	int result=0;
-	char *tmp;
-	vcedit_page_buffer *buffer;
-	
-	buffer = &bufferlink->buffer;
-	tmp = realloc(buffer->data,
-		      buffer->data_len + og->header_len + og->body_len);
-	if(tmp) {
-		buffer->data = tmp;
-		memcpy(buffer->data + buffer->data_len, og->header,
-		       og->header_len);
-		buffer->data_len += og->header_len;
-		memcpy(buffer->data + buffer->data_len, og->body,
-	       og->body_len);
-		result = 1;
-		buffer->data_len += og->body_len;
-	} else {
-		result = -1;
-	}
-	
-	return result;
-}
-
-/* Write and free the first link using callbacks */
-static int buffer_chain_writelink(vcedit_state *state, void *out) {
-	int result = 0;
-	vcedit_buffer_chain *tmpchain;
-	vcedit_page_buffer *tmpbuffer;
-
-	tmpchain = state->sidebuf;
-	tmpbuffer = &tmpchain->buffer;
-	if(tmpbuffer->data_len)
-	{
-		if(state->write(tmpbuffer->data,1,tmpbuffer->data_len, out) !=
-		   (size_t) tmpbuffer->data_len)
-			result = -1;
-		else 
-			result = 1;
-	}
-
-	free(tmpbuffer->data);
-	state->sidebuf = tmpchain->next;
-	free(tmpchain);
-	return result;
-}
-
-
-static int buffer_chain_newlink(vcedit_state *state) {
-	int result = 1;
-	vcedit_buffer_chain *bufferlink;
-	
-	if(!state->sidebuf) {
-		state->sidebuf = malloc (sizeof *state->sidebuf);
-		if(state->sidebuf) {
-			bufferlink = state->sidebuf;
-		} else {
-			result = -1;
-		}
-	} else {
-		bufferlink=state->sidebuf;
-		while(bufferlink->next) {
-			bufferlink = bufferlink->next;
-		}
-		bufferlink->next =  malloc (sizeof *bufferlink->next);
-		if(bufferlink->next) {
-			bufferlink = bufferlink->next;
-		} else {
-			result = -1;
-		}
-	}
-
-	if(result > 0 ) {
-		bufferlink->next = 0;
-		bufferlink->buffer.data = 0;
-		bufferlink->buffer.data_len = 0;
-	}
-	else 
-		state->lasterror =
-			_("Couldn't get enough memory for input buffering.");
-
-  return result;
-}
-
-
-/* Push page onto the end of the buffer chain */
-static int buffer_chain_push(vcedit_state *state, ogg_page *og) {
-	/* If there is no sidebuffer yet we need to create one, otherwise
-	 * traverse to the last buffer and push the new page onto it. */
-	int result=1;
-	vcedit_buffer_chain *bufferlink;
-	if(!state->sidebuf) {
-		result = buffer_chain_newlink(state);
-	}
-	
-	if(result > 0) {
-		bufferlink = state->sidebuf;
-		while(bufferlink->next) {
-			bufferlink = bufferlink->next;
-	}
-		result = page_buffer_push(bufferlink, og);
-	}
-
-	if(result < 0)
-		state->lasterror =
-			_("Couldn't get enough memory for input buffering.");
-
-	return result;
-}
-
-
-
-static int vcedit_supported_stream(vcedit_state *state, ogg_page *og) {
-	ogg_stream_state os;
-	vorbis_info vi;
-	vorbis_comment vc;
-	ogg_packet header;
-	int result = 0;
-	
-	ogg_stream_init(&os, ogg_page_serialno(og));
-	vorbis_info_init(&vi);
-	vorbis_comment_init(&vc);
-	
-	if( !ogg_page_bos(og) )
-                result = -1;
-
-	if(result >= 0 && ogg_stream_pagein(&os, og) < 0)
-	{
-		state->lasterror =
-			_("Error reading first page of Ogg bitstream.");
-		result = -1;
-	}
-
-	if(result >= 0 && ogg_stream_packetout(&os, &header) != 1)
-	{
-		state->lasterror = _("Error reading initial header packet.");
-		result = -1;
-	}
-
-	if(result >= 0 && vorbis_synthesis_headerin(&vi, &vc, &header) >= 0)
-	{
-                result = 1;
-	} else {
-		/* Not vorbis, may eventually become a chain of checks (Speex,
-		 * Theora), but for the moment return 0, bos scan will push
-                 * the current page onto the buffer.
-		 */
-	}
-
-	ogg_stream_clear(&os);
-	vorbis_info_clear(&vi);
-	vorbis_comment_clear(&vc);
-        return result;
-}
-
-
-static int vcedit_contains_serial (vcedit_state *state, int serialno) {
-	int result = 0;
-	size_t count;
-	for( count=0; count < state->serials.streams_len; count++ ) {
-		if ( *(state->serials.streams + count ) == serialno )
-			result = 1;
-	}
-	
-	return result;
-}
-
-
-static int vcedit_add_serial (vcedit_state *state, long serial) {
-        int result = 0;
-        long *tmp;
-	
-	
-	if( vcedit_contains_serial(state, serial) )
-        {
-		result = 1;
-	} else {
-		tmp   = realloc(state->serials.streams,
-				(state->serials.streams_len + 1) * sizeof *tmp);
-		if(tmp) {
-			state->serials.streams = tmp;
-			*(state->serials.streams +
-			  state->serials.streams_len) = serial;
-			state->serials.streams_len += 1;
-			result = 1;
-		} else {
-			state->lasterror =
-				_("Couldn't get enough memory to register new stream serial number.");
-		        result = -1;
-		}
-	} 
-	return result;
-}
-
-
-/* For the benefit of the secondary header read only.  Quietly creates
- * newlinks and pushes pages onto the buffer in the right way */
-static int vcedit_target_pageout (vcedit_state *state, ogg_page *og) {
-	int result = 0;
-	int pageout_result;
-	pageout_result = ogg_sync_pageout(state->oy, og);
-	if(pageout_result > 0)
-	{
-		if(state->serial == ogg_page_serialno(og))
-			result = buffer_chain_newlink(state);
-		else
-			result = buffer_chain_push(state, og);
-	} else if (pageout_result < 0) {
-		/* Vorbis comment traditionally ignores the not-synced
-		 * error from pageout, so give it a different code. */
-		result = -2;
-	}
-	return result;
-}
-
-
-/* (I'm paranoid about memset(x,0,len) not giving null pointers */
-vcedit_state *vcedit_new_state(void) {
-	vcedit_state *state = malloc(sizeof(vcedit_state));
-	if(state) {
-		memset(state, 0, sizeof(vcedit_state));
-		state->sidebuf = 0;
-		state->serials.streams = 0;
-		state->serials.streams_len = 0;
-	}
-	return state;
-}
-
-char *vcedit_error(vcedit_state *state) {
-	return state->lasterror;
-}
-
-vorbis_comment *vcedit_comments(vcedit_state *state) {
-	return state->vc;
-}
-
-static void vcedit_clear_internals(vcedit_state *state) {
-    char *tmp;
-	if(state->vc) {
-		vorbis_comment_clear(state->vc);
-		free(state->vc);
-	}
-	if(state->os) {
-		ogg_stream_clear(state->os);
-		free(state->os);
-	}
-	if(state->oy) {
-		ogg_sync_clear(state->oy);
-		free(state->oy);
-	}
-	if(state->serials.streams_len) {
-		free(state->serials.streams);
-		state->serials.streams_len = 0;
-		state->serials.streams = 0;
-	}
-	while(state->sidebuf) {
-		vcedit_buffer_chain *tmpbuffer;
-		tmpbuffer = state->sidebuf;
-		state->sidebuf = tmpbuffer->next;
-		free(tmpbuffer->buffer.data);
-		free(tmpbuffer);
-	}
-	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);
-    }
-
-    tmp = state->lasterror;
-    memset(state, 0, sizeof(*state));
-    state->lasterror = tmp;
-}
-
-void vcedit_clear(vcedit_state *state)
-{
-	if(state)
-	{
-		vcedit_clear_internals(state);
-		free(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,char *s, int len)
-{
-	while(len--)
-	{
-		oggpack_write(o,*s++,8);
-	}
-}
-
-static int _commentheader_out(vorbis_comment *vc, char *vendor, ogg_packet *op)
-{
-	oggpack_buffer opb;
-
-	oggpack_writeinit(&opb);
-
-	/* preamble */  
-	oggpack_write(&opb,0x03,8);
-	_v_writestring(&opb,"vorbis", 6);
-
-	/* vendor */
-	oggpack_write(&opb,strlen(vendor),32);
-	_v_writestring(&opb,vendor, strlen(vendor));
-
-	/* 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);
-			}
-		}
-	}
-	oggpack_write(&opb,1,1);
-
-	op->packet = 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;
-
-	oggpack_writeclear(&opb);
-	return 0;
-}
-
-static int _blocksize(vcedit_state *s, ogg_packet *p)
-{
-	int this = vorbis_packet_blocksize(s->vi, p);
-	int ret = (this + s->prevW)/4;
-
-	if(!s->prevW)
-	{
-		s->prevW = this;
-		return 0;
-	}
-
-	s->prevW = this;
-	return ret;
-}
-
-static int _fetch_next_packet(vcedit_state *s, ogg_packet *p, ogg_page *page)
-{
-	int result;
-	char *buffer;
-	int bytes;
-	int serialno;
-
-	result = ogg_stream_packetout(s->os, p);
-
-	if(result > 0)
-		return 1;
-	else {
-		while(1) {
-			if(s->eosin)
-				return 0;
-
-			while(ogg_sync_pageout(s->oy, page) <= 0)
-			{
-				buffer = ogg_sync_buffer(s->oy, CHUNKSIZE);
-				bytes = s->read(buffer,1, CHUNKSIZE, s->in);
-				ogg_sync_wrote(s->oy, bytes);
-				if(bytes == 0)
-				return 0;
-			}
-
-			serialno = ogg_page_serialno(page);
-			if(ogg_page_serialno(page) != s->serial)
-			{
-				if(vcedit_contains_serial(s, serialno)) {
-					result = buffer_chain_push(s, page);
-					if(result < 0)
-						return result;
-				}
-				else
-				{
-					s->eosin = 1;
-					s->extrapage = 1;
-					return 0;
-				}
-			} 
-			else
-			{
-			  ogg_stream_pagein(s->os, page);
-			  result = buffer_chain_newlink(s);
-			  if (result < 0)
-				  return result;
-
-			  if(ogg_page_eos(page))
-				s->eosin = 1;
-			}
-			result = ogg_stream_packetout(s->os, p);
-			if(result > 0)
-				return 1;
-		}
-		/* Here == trouble */
-		return 0;
-	}
-}
-
-int vcedit_open(vcedit_state *state, FILE *in)
-{
-	return vcedit_open_callbacks(state, (void *)in, 
-			(vcedit_read_func)fread, (vcedit_write_func)fwrite);
-}
-
-int vcedit_open_callbacks(vcedit_state *state, void *in,
-		vcedit_read_func read_func, vcedit_write_func write_func)
-{
-
-	char *buffer;
-	int bytes,i;
-	int chunks = 0;
-	int read_bos, test_supported, page_pending;
-	int have_vorbis;
-	ogg_packet *header;
-	ogg_packet	header_main;
-	ogg_packet  header_comments;
-	ogg_packet	header_codebooks;
-	ogg_page    og;
-
-	state->in = in;
-	state->read = read_func;
-	state->write = write_func;
-
-	state->oy = malloc(sizeof(ogg_sync_state));
-	ogg_sync_init(state->oy);
-
-    while(1)
-    {
-    	buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
-	    bytes = state->read(buffer, 1, CHUNKSIZE, state->in);
-
-    	ogg_sync_wrote(state->oy, bytes);
-
-        if(ogg_sync_pageout(state->oy, &og) == 1)
-            break;
-
-        if(chunks++ >= 10) /* Bail if we don't find data in the first 40 kB */
-        {
-		    if(bytes<CHUNKSIZE)
-			    state->lasterror = _("Input truncated or empty.");
-    		else
-	    		state->lasterror = _("Input is not an Ogg bitstream.");
-	    goto err;
-	}
-    }
-
-    /* BOS loop, starting with a loaded ogg page. */
-    if(buffer_chain_newlink(state) < 0)
-	    goto err;
-
-    for( read_bos = 1, have_vorbis = 0 ; read_bos; )
-    {
-	    test_supported = vcedit_supported_stream(state, &og);
-	    if(test_supported < 0)
-	    {
-		    goto err;
-	    }
-	    else if (test_supported == 0 || have_vorbis )
-	    {
-		    if(vcedit_add_serial ( state, ogg_page_serialno(&og)) < 0)
-			    goto err;
-		    if( buffer_chain_push(state, &og) < 0)
-			    goto err;
-	    }
-	    else if (test_supported > 0)
-	    {
-		    if(buffer_chain_newlink(state) < 0)
-			    goto err;
-		    state->serial = ogg_page_serialno(&og);
-		    if(vcedit_add_serial ( state, ogg_page_serialno(&og)) < 0)
-		       goto err;
- 
-		    state->os = malloc(sizeof(ogg_stream_state));
-		    ogg_stream_init(state->os, state->serial);
-
-		    state->vi = malloc(sizeof(vorbis_info));
-		    vorbis_info_init(state->vi);
-
-		    state->vc = malloc(sizeof(vorbis_comment));
-		    vorbis_comment_init(state->vc);
-
-		    if(ogg_stream_pagein(state->os, &og) < 0)
-		    {
-			    state->lasterror = 
-				    _("Error reading first page of Ogg bitstream.");
-			    goto err;
-		    }
-
-		    if(ogg_stream_packetout(state->os, &header_main) != 1)
-		    {
-			    state->lasterror =
-				    _("Error reading initial header packet.");
-			    goto err;
-		    }
-
-		    if(vorbis_synthesis_headerin(state->vi, state->vc,
-						 &header_main) < 0)
-		    {
-			    state->lasterror =
-				    _("Ogg bitstream does not contain Vorbis data.");
-			    goto err;
-		    }
-		    have_vorbis = 1;
-	    }
-	    while(1)
-	    {
-		    buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
-		    bytes = state->read(buffer, 1, CHUNKSIZE, state->in);
-
-		    if(bytes == 0)
-		    {
-			    state->lasterror =
-				    _("EOF before recognised stream.");
-			    goto err;
-		    }
-
-		    ogg_sync_wrote(state->oy, bytes);
-
-		    if(ogg_sync_pageout(state->oy, &og) == 1)
-			    break;
-	    }
-	    if(!ogg_page_bos(&og)) {
-		    read_bos = 0;
-		    page_pending = 1;
-	    }
-    }
-
-        if(!state->os) {
-		state->lasterror = _("Ogg bitstream does not contain a supported data-type.");
-		goto err;
-	}
-
-	state->mainlen = header_main.bytes;
-	state->mainbuf = malloc(state->mainlen);
-	memcpy(state->mainbuf, header_main.packet, header_main.bytes);
-
-	if(ogg_page_serialno(&og) == state->serial)
-	{
-		if(buffer_chain_newlink(state) < 0)
-			goto err;
-	}
-
-	else
-	{
-		if(buffer_chain_push(state, &og) < 0)
-			goto err;
-		page_pending = 0;
-	}
-
-	i = 0;
-	header = &header_comments;
-	while(i<2) {
-		while(i<2) {
-			int result;
-			if(!page_pending)
-				result = vcedit_target_pageout(state, &og);
-			else
-			{
-				result = 1;
-				page_pending = 0;
-			}
-			if(result == 0 || result == -2) break; /* Too little data so far */
-			else if(result == -1) goto err;
-			else if(result == 1)
-			{
-				ogg_stream_pagein(state->os, &og);
-				while(i<2)
-				{
-					result = ogg_stream_packetout(state->os, header);
-					if(result == 0) break;
-					if(result == -1)
-					{
-						state->lasterror = _("Corrupt secondary header.");
-						goto err;
-					}
-					vorbis_synthesis_headerin(state->vi, state->vc, header);
-					if(i==1)
-					{
-						state->booklen = header->bytes;
-						state->bookbuf = malloc(state->booklen);
-						memcpy(state->bookbuf, header->packet, 
-								header->bytes);
-					}
-					i++;
-					header = &header_codebooks;
-				}
-			}
-		}
-
-		buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
-		bytes = state->read(buffer, 1, CHUNKSIZE, state->in);
-		if(bytes == 0 && i < 2)
-		{
-			state->lasterror = _("EOF before end of Vorbis headers.");
-			goto err;
-		}
-		ogg_sync_wrote(state->oy, bytes);
-	}
-
-	/* Copy the vendor tag */
-	state->vendor = malloc(strlen(state->vc->vendor) +1);
-	strcpy(state->vendor, state->vc->vendor);
-
-	/* Headers are done! */
-	return 0;
-
-err:
-	vcedit_clear_internals(state);
-	return -1;
-}
-
-int vcedit_write(vcedit_state *state, void *out)
-{
-	ogg_stream_state streamout;
-	ogg_packet header_main;
-	ogg_packet header_comments;
-	ogg_packet header_codebooks;
-
-	ogg_page ogout, ogin;
-	ogg_packet op;
-	ogg_int64_t granpos = 0;
-	int result;
-	char *buffer;
-	int bytes;
-	int needflush=0, needout=0;
-
-	state->eosin = 0;
-	state->extrapage = 0;
-
-	header_main.bytes = state->mainlen;
-	header_main.packet = state->mainbuf;
-	header_main.b_o_s = 1;
-	header_main.e_o_s = 0;
-	header_main.granulepos = 0;
-
-	header_codebooks.bytes = state->booklen;
-	header_codebooks.packet = state->bookbuf;
-	header_codebooks.b_o_s = 0;
-	header_codebooks.e_o_s = 0;
-	header_codebooks.granulepos = 0;
-
-	ogg_stream_init(&streamout, state->serial);
-
-	_commentheader_out(state->vc, state->vendor, &header_comments);
-
-	ogg_stream_packetin(&streamout, &header_main);
-	ogg_stream_packetin(&streamout, &header_comments);
-	ogg_stream_packetin(&streamout, &header_codebooks);
-
-	while((result = ogg_stream_flush(&streamout, &ogout)))
-	{
-		if(state->sidebuf && buffer_chain_writelink(state, out) < 0)
-			goto cleanup;
-		if(state->write(ogout.header,1,ogout.header_len, out) !=
-				(size_t) ogout.header_len)
-			goto cleanup;
-		if(state->write(ogout.body,1,ogout.body_len, out) != 
-				(size_t) ogout.body_len)
-			goto cleanup;
-	}
-
-	while(state->sidebuf) {
-	  if(buffer_chain_writelink(state, out) < 0)
-	    goto cleanup;
-	}
-	if(buffer_chain_newlink(state) < 0)
-		goto cleanup;
-
-	while(_fetch_next_packet(state, &op, &ogin))
-	{
-		int size;
-		size = _blocksize(state, &op);
-		granpos += size;
-
-		if(needflush)
-		{
-			if(ogg_stream_flush(&streamout, &ogout))
-			{
-				if(state->sidebuf &&
-				   buffer_chain_writelink(state, out) < 0)
-					goto cleanup;
-				if(state->write(ogout.header,1,ogout.header_len, 
-							out) != (size_t) ogout.header_len)
-					goto cleanup;
-				if(state->write(ogout.body,1,ogout.body_len, 
-							out) != (size_t) ogout.body_len)
-					goto cleanup;
-			}
-		}
-		else if(needout)
-		{
-			if(ogg_stream_pageout(&streamout, &ogout))
-			{
-				if(state->sidebuf &&
-				   buffer_chain_writelink(state, out) < 0)
-					goto cleanup;
-				if(state->write(ogout.header,1,ogout.header_len, 
-							out) != (size_t) ogout.header_len)
-					goto cleanup;
-				if(state->write(ogout.body,1,ogout.body_len, 
-							out) != (size_t) ogout.body_len)
-					goto cleanup;
-			}
-		}
-
-		needflush=needout=0;
-
-		if(op.granulepos == -1)
-		{
-			op.granulepos = granpos;
-			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)
-			{
-				granpos = op.granulepos;
-				ogg_stream_packetin(&streamout, &op);
-				needflush=1;
-			}
-			else 
-			{
-				ogg_stream_packetin(&streamout, &op);
-				needout=1;
-			}
-		}		
-	}
-
-	streamout.e_o_s = 1;
-	while(ogg_stream_flush(&streamout, &ogout))
-	{
-		if(state->sidebuf && buffer_chain_writelink(state, out) < 0)
-			goto cleanup;
-		if(state->write(ogout.header,1,ogout.header_len, 
-					out) != (size_t) ogout.header_len)
-			goto cleanup;
-		if(state->write(ogout.body,1,ogout.body_len, 
-					out) != (size_t) ogout.body_len)
-			goto cleanup;
-	}
-
-	if (state->extrapage)
-	{
-		/* This is the first page of a new chain, get rid of the
-		 * sidebuffer */
-		while(state->sidebuf)
-			if(buffer_chain_writelink(state, out) < 0)
-				goto cleanup;
-		if(state->write(ogin.header,1,ogin.header_len,
-		                out) != (size_t) ogin.header_len)
-			goto cleanup;
-		if (state->write(ogin.body,1,ogin.body_len, out) !=
-				(size_t) ogin.body_len)
-			goto cleanup;
-	}
-
-	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)
-                break;
-			if(result<0)
-				state->lasterror = _("Corrupt or missing data, continuing...");
-			else
-			{
-				/* Don't bother going through the rest, we can just 
-				 * write the page out now */
-				if(state->write(ogout.header,1,ogout.header_len, 
-						out) != (size_t) ogout.header_len) {
-					goto cleanup;
-                }
-				if(state->write(ogout.body,1,ogout.body_len, out) !=
-						(size_t) ogout.body_len) {
-					goto cleanup;
-                }
-			}
-		}
-		buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
-		bytes = state->read(buffer,1, CHUNKSIZE, state->in);
-		ogg_sync_wrote(state->oy, bytes);
-		if(bytes == 0) 
-		{
-			state->eosin = 1;
-			break;
-		}
-	}
-
-
-cleanup:
-	ogg_stream_clear(&streamout);
-
-    /* We don't ogg_packet_clear() this, because the memory was allocated in
-       _commentheader_out(), so we mirror that here */
-    _ogg_free(header_comments.packet);
-
-	free(state->mainbuf);
-	free(state->bookbuf);
-    state->mainbuf = state->bookbuf = NULL;
-
-	if(!state->eosin)
-	{
-		state->lasterror =
-			_("Error writing stream to output. "
-			"Output stream may be corrupted or truncated.");
-		return -1;
-	}
-
-	return 0;
-}
diff --git a/plugins/vorbis/vcedit.h b/plugins/vorbis/vcedit.h
deleted file mode 100644
index 173876f..0000000
--- a/plugins/vorbis/vcedit.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* 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).
- *
- * (c) 2000-2001 Michael Smith <msmith at xiph.org>
- *
- * VCEdit header.
- *
- * last modified: $ID:$
- */
-
-#ifndef __VCEDIT_H
-#define __VCEDIT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif 
-
-#include <stdio.h>
-#include <ogg/ogg.h>
-#include <vorbis/codec.h>
-
-typedef size_t (*vcedit_read_func)(void *, size_t, size_t, void *);
-typedef size_t (*vcedit_write_func)(const void *, size_t, size_t, void *);
-
-typedef struct {
-	long *streams;
-	size_t streams_len;
-} vcedit_serial_nos;
-
-typedef struct {
-	ogg_sync_state		*oy;
-	ogg_stream_state	*os;
-
-	vorbis_comment		*vc;
-	vorbis_info         *vi;
-
-	vcedit_read_func read;
-	vcedit_write_func write;
-
-	void		  *in;
-	int serial;
-	vcedit_serial_nos serials;
-	unsigned char	  *mainbuf;
-	unsigned char	  *bookbuf;
-	int	          mainlen;
-	int	          booklen;
-	char   *lasterror;
-	char   *vendor;
-	int prevW;
-	int extrapage;
-	int eosin;
-        struct vcedit_buffer_chain *sidebuf;
-} 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, FILE *in);
-extern int		vcedit_open_callbacks(vcedit_state *state, void *in,
-		vcedit_read_func read_func, vcedit_write_func write_func);
-extern int		vcedit_write(vcedit_state *state, void *out);
-extern char *   vcedit_error(vcedit_state *state);
-
-#ifdef __cplusplus
-}
-#endif 
-
-#endif /* __VCEDIT_H */
-
diff --git a/plugins/vorbis/vceditaux.h b/plugins/vorbis/vceditaux.h
deleted file mode 100644
index bb40eae..0000000
--- a/plugins/vorbis/vceditaux.h
+++ /dev/null
@@ -1,9 +0,0 @@
-typedef struct vcedit_page_buffer {
-	char *data;
-	size_t data_len;
-} vcedit_page_buffer;
-	
-typedef struct vcedit_buffer_chain {
-	struct vcedit_buffer_chain *next;
-	struct vcedit_page_buffer buffer;
-} vcedit_buffer_chain;
diff --git a/plugins/vorbis/vorbis.c b/plugins/vorbis/vorbis.c
index 5851a95..9b2d868 100644
--- a/plugins/vorbis/vorbis.c
+++ b/plugins/vorbis/vorbis.c
@@ -1,53 +1,65 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2014 Alexey Yakovenko and other contributors
 
-    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 software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
 
-    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.
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
-#include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
 #include <string.h>
 #include <stdlib.h>
-#include <assert.h>
 #include <limits.h>
 #include <unistd.h>
 #include <math.h>
+#include <stdbool.h>
 #include "../../deadbeef.h"
-#include "vcedit.h"
+#include "../liboggedit/oggedit.h"
 
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))
 
-//#define trace(...) { fprintf (stderr, __VA_ARGS__); }
+// #define trace(...) { fprintf (stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
+#if WORDS_BIGENDIAN
+#define CVORBIS_ENDIANNESS 1
+#else
+#define CVORBIS_ENDIANNESS 0
+#endif
+
+#define RG_REFERENCE_LOUDNESS -1
+#define DELIMITER "\n - \n"
+
 static DB_decoder_t plugin;
 static DB_functions_t *deadbeef;
 
 typedef struct {
     DB_fileinfo_t info;
     OggVorbis_File vorbis_file;
-    vorbis_info *vi;
     int cur_bit_stream;
-    int startsample;
-    int endsample;
-    int currentsample;
-    int last_comment_update;
-    DB_playItem_t *ptrack;
+    float next_update;
+    DB_playItem_t *it;
+    const DB_playItem_t *new_track;
+    uint8_t *channel_map;
 } ogg_info_t;
 
 static size_t
@@ -74,92 +86,90 @@ cvorbis_ftell (void *datasource) {
     return deadbeef->ftell (datasource);
 }
 
-static const char *metainfo[] = {
-    "ARTIST", "artist",
-    "TITLE", "title",
-    "ALBUM", "album",
-    "TRACKNUMBER", "track",
-    "DATE", "year",
-    "GENRE", "genre",
-    "COMMENT", "comment",
-    "PERFORMER", "performer",
-    "COMPOSER", "composer",
-    "DISCNUMBER", "disc",
-    "COPYRIGHT", "copyright",
-    "TOTALTRACKS", "numtracks",
-    "TRACKTOTAL", "numtracks",
-    NULL
-};
+static const char
+*gain_tag_name(const int tag_enum)
+{
+    switch(tag_enum) {
+        case DDB_REPLAYGAIN_ALBUMGAIN:
+            return "REPLAYGAIN_ALBUM_GAIN";
+        case DDB_REPLAYGAIN_ALBUMPEAK:
+            return "REPLAYGAIN_ALBUM_PEAK";
+        case DDB_REPLAYGAIN_TRACKGAIN:
+            return "REPLAYGAIN_TRACK_GAIN";
+        case DDB_REPLAYGAIN_TRACKPEAK:
+            return "REPLAYGAIN_TRACK_PEAK";
+        case RG_REFERENCE_LOUDNESS:
+            return "REPLAYGAIN_REFERENCE_LOUDNESS";
+        default:
+            return "";
+    }
+}
 
-// refresh_playlist == 1 means "send playlistchanged event if metadata had been changed"
-// refresh_playlist == 2 means "don't change memory, just check for changes"
-static int
-update_vorbis_comments (DB_playItem_t *it, vorbis_comment *vc, int refresh_playlist) {
-    if (refresh_playlist == 1) {
-        if (!update_vorbis_comments (it, vc, 2)) {
-            return 0;
+static bool
+is_special_tag(const char *tag) {
+    return !strcasecmp(tag, gain_tag_name(DDB_REPLAYGAIN_ALBUMGAIN)) ||
+           !strcasecmp(tag, gain_tag_name(DDB_REPLAYGAIN_ALBUMPEAK)) ||
+           !strcasecmp(tag, gain_tag_name(DDB_REPLAYGAIN_TRACKGAIN)) ||
+           !strcasecmp(tag, gain_tag_name(DDB_REPLAYGAIN_TRACKPEAK)) ||
+           !strcasecmp(tag, gain_tag_name(RG_REFERENCE_LOUDNESS));
+}
+
+static bool
+add_meta(DB_playItem_t *it, const char *key, const char *value)
+{
+    const char *old_value = deadbeef->pl_find_meta(it, key);
+    if (old_value) {
+        char *new_value = malloc(strlen(old_value) + strlen(DELIMITER) + strlen(value) + 1);
+        if (new_value) {
+            sprintf(new_value, "%s"DELIMITER"%s", old_value, value);
+            deadbeef->pl_replace_meta(it, key, new_value);
+            free(new_value);
+            return true;
         }
     }
+    else {
+        deadbeef->pl_add_meta(it, key, value);
+        return true;
+    }
+}
 
-    if (vc) {
-        if (refresh_playlist != 2) {
-            deadbeef->pl_delete_all_meta (it);
-        }
-        for (int i = 0; i < vc->comments; i++) {
-            char *s = vc->user_comments[i];
-            int m;
-            for (m = 0; metainfo[m]; m += 2) {
-                int l = strlen (metainfo[m]);
-                if (vc->comment_lengths[i] > l && !strncasecmp (metainfo[m], s, l) && s[l] == '=') {
-                    if (refresh_playlist == 2) {
-                        deadbeef->pl_lock ();
-                        const char *val = deadbeef->pl_find_meta (it, metainfo[m+1]);
-                        if (!val || strcmp (val, s+l+1)) {
-                            deadbeef->pl_unlock ();
-                            return 1;
-                        }
-                        deadbeef->pl_unlock ();
-                    }
-                    else {
-                        deadbeef->pl_append_meta (it, metainfo[m+1], s + l + 1);
-                        break;
-                    }
-                }
-            }
-            if (!metainfo[m] && refresh_playlist != 2) {
-                if (!strncasecmp (s, "cuesheet=", 9)) {
-                    deadbeef->pl_add_meta (it, "cuesheet", s + 9);
-                }
-                else if (!strncasecmp (s, "replaygain_album_gain=", 22)) {
-                    deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, atof (s+22));
-                }
-                else if (!strncasecmp (s, "replaygain_album_peak=", 22)) {
-                    deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, atof (s+22));
-                }
-                else if (!strncasecmp (s, "replaygain_track_gain=", 22)) {
-                    deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, atof (s+22));
-                }
-                else if (!strncasecmp (s, "replaygain_track_peak=", 22)) {
-                    deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, atof (s+22));
-                }
-                else {
-                    const char *p = s;
-                    while (*p && *p != '=') {
-                        p++;
-                    }
-                    if (*p == '=') {
-                        char key[p-s+1];
-                        memcpy (key, s, p-s);
-                        key[p-s] = 0;
-                        deadbeef->pl_add_meta (it, key, p+1);
-                    }
+static bool
+replaygain_tag(DB_playItem_t *it, const int tag_enum, const char *tag, const char *value)
+{
+    if (strcasecmp(gain_tag_name(tag_enum), tag))
+        return false;
+
+    deadbeef->pl_set_item_replaygain (it, tag_enum, atof(value));
+    return true;
+}
+
+static int
+update_vorbis_comments (DB_playItem_t *it, OggVorbis_File *vorbis_file, const int tracknum) {
+    const vorbis_comment *vc = ov_comment(vorbis_file, tracknum);
+    if (!vc) {
+        trace("update_vorbis_comments: ov_comment failed\n");
+        return -1;
+    }
+
+    deadbeef->pl_delete_all_meta (it);
+    for (int i = 0; i < vc->comments; i++) {
+        char *tag = strdup(vc->user_comments[i]);
+        char *value;
+        if (tag && (value = strchr(tag, '='))) {
+            *value++ = '\0';
+            if (!replaygain_tag(it, DDB_REPLAYGAIN_ALBUMGAIN, tag, value) &&
+                !replaygain_tag(it, DDB_REPLAYGAIN_ALBUMPEAK, tag, value) &&
+                !replaygain_tag(it, DDB_REPLAYGAIN_TRACKGAIN, tag, value) &&
+                !replaygain_tag(it, DDB_REPLAYGAIN_TRACKPEAK, tag, value)) {
+                if (!strcasecmp(tag, gain_tag_name(RG_REFERENCE_LOUDNESS)))
+                    deadbeef->pl_replace_meta(it, ":REPLAYGAIN_REFERENCE_LOUDNESS", value);
+                else
+                    add_meta(it, oggedit_map_tag(tag, "tag2meta"), value);
                 }
-            }
+            free(tag);
         }
     }
-    if (refresh_playlist == 2) {
-        return 0;
-    }
+
     deadbeef->pl_add_meta (it, "title", NULL);
     uint32_t f = deadbeef->pl_get_item_flags (it);
     f &= ~DDB_TAG_MASK;
@@ -170,35 +180,67 @@ update_vorbis_comments (DB_playItem_t *it, vorbis_comment *vc, int refresh_playl
         deadbeef->plt_modified (plt);
         deadbeef->plt_unref (plt);
     }
+    deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
 
-    if (refresh_playlist) {
-        deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+    return 0;
+}
+
+static void
+set_meta_ll(DB_playItem_t *it, const char *key, const int64_t value)
+{
+    char string[11];
+    sprintf(string, "%lld", value);
+    deadbeef->pl_replace_meta(it, key, string);
+}
+
+static int
+cvorbis_seek_sample (DB_fileinfo_t *_info, int sample) {
+    ogg_info_t *info = (ogg_info_t *)_info;
+    if (sample < 0) {
+        trace ("vorbis: negative seek sample - ignored, but it is a bug!\n");
+        return -1;
+    }
+    if (!info->info.file) {
+        trace ("vorbis: file is NULL on seek\n");
+        return -1;
+    }
+    if (sample == 0) {
+        deadbeef->pl_lock ();
+        const char *filetype = deadbeef->pl_find_meta_raw(info->it, ":FILETYPE");
+        if (filetype && strncmp(filetype, "Ogg Vorbis", 10)) {
+            sample = 1; // workaround libvorbis bug #1486 (ddb issue #1116)
+        }
+        deadbeef->pl_unlock ();
     }
+    sample += info->it->startsample;
+    trace ("vorbis: seek to sample %d\n", sample);
+    int res = ov_pcm_seek (&info->vorbis_file, sample);
+    if (res != 0 && res != OV_ENOSEEK) {
+        trace ("vorbis: error %x seeking to sample %d\n", res, sample);
+        return -1;
+    }
+    int tell = ov_pcm_tell (&info->vorbis_file);
+    if (tell != sample) {
+        trace ("vorbis: failed to do sample-accurate seek (%d->%d)\n", sample, tell);
+    }
+    trace ("vorbis: seek successful\n")
+    _info->readpos = (float)(sample - info->it->startsample)/_info->fmt.samplerate;
+    info->next_update = -2;
     return 0;
 }
 
 static DB_fileinfo_t *
 cvorbis_open (uint32_t hints) {
-    DB_fileinfo_t *_info = malloc (sizeof (ogg_info_t));
-    ogg_info_t *info = (ogg_info_t *)_info;
-    memset (info, 0, sizeof (ogg_info_t));
-    return _info;
+    return calloc(1, sizeof (ogg_info_t));
 }
 
 static int
 cvorbis_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
+    trace("cvorbis_init\n");
     ogg_info_t *info = (ogg_info_t *)_info;
-    info->info.file = NULL;
-    info->vi = NULL;
-    if (it->endsample > 0) {
-        info->cur_bit_stream = -1;
-    }
-    else {
-        int tracknum = deadbeef->pl_find_meta_int (it, ":TRACKNUM", -1);
-        info->cur_bit_stream = tracknum;
-    }
-    info->ptrack = it;
+    info->new_track = info->it = it;
     deadbeef->pl_item_ref (it);
+    deadbeef->pl_replace_meta (it, "!FILETYPE", "OggVorbis");
 
     deadbeef->pl_lock ();
     info->info.file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
@@ -207,8 +249,7 @@ cvorbis_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
         trace ("ogg: failed to open file %s\n", deadbeef->pl_find_meta (it, ":URI"));
         return -1;
     }
-    int ln = deadbeef->fgetlength (info->info.file);
-    if (info->info.file->vfs->is_streaming () && ln == -1) {
+    if (info->info.file->vfs->is_streaming () && deadbeef->fgetlength (info->info.file) == -1) {
         ov_callbacks ovcb = {
             .read_func = cvorbis_fread,
             .seek_func = NULL,
@@ -244,61 +285,55 @@ cvorbis_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
             trace ("ov_open_callbacks returned %d\n", err);
             return -1;
         }
-//        deadbeef->pl_set_item_duration (it, ov_time_total (&vorbis_file, -1));
     }
-    info->vi = ov_info (&info->vorbis_file, info->cur_bit_stream);
-    if (!info->vi) { // not a vorbis stream
+//    _info->readpos = 0;
+    if (info->info.file->vfs->is_streaming ()) {
+        info->it->startsample = 0;
+        if (deadbeef->pl_get_item_duration (it) < 0) {
+            it->endsample = -1;
+        }
+        else {
+            it->endsample = ov_pcm_total (&info->vorbis_file, -1)-1;
+        }
+        if (update_vorbis_comments (it, &info->vorbis_file, -1))
+            return -1;
+        deadbeef->pl_set_meta_int(info->it, ":TRACKNUM", 0);
+    }
+    else {
+        cvorbis_seek_sample (_info, 0);
+    }
+
+    vorbis_info *vi = ov_info (&info->vorbis_file, -1);
+    if (!vi) {
         trace ("not a vorbis stream\n");
         return -1;
     }
-    if (info->vi->rate <= 0) {
+    if (vi->rate <= 0) {
         trace ("vorbis: bad samplerate\n");
         return -1;
     }
     _info->plugin = &plugin;
     _info->fmt.bps = 16;
-    //_info->dataSize = ov_pcm_total (&vorbis_file, -1) * vi->channels * 2;
-    _info->fmt.channels = info->vi->channels;
-    _info->fmt.samplerate = info->vi->rate;
-
+    _info->fmt.samplerate = vi->rate;
+    _info->fmt.channels = vi->channels;
+    info->channel_map = oggedit_vorbis_channel_map(vi->channels);
     for (int i = 0; i < _info->fmt.channels; i++) {
         _info->fmt.channelmask |= 1 << i;
     }
 
-    _info->readpos = 0;
-    info->currentsample = 0;
-    if (!info->info.file->vfs->is_streaming ()) {
-        if (it->endsample > 0) {
-            info->startsample = it->startsample;
-            info->endsample = it->endsample;
-            plugin.seek_sample (_info, 0);
-        }
-        else {
-            info->startsample = 0;
-            info->endsample = ov_pcm_total (&info->vorbis_file, -1)-1;
-        }
-    }
-    else {
-        info->startsample = 0;
-        if (deadbeef->pl_get_item_duration (it) < 0) {
-            info->endsample = -1;
-        }
-        else {
-            info->endsample = ov_pcm_total (&info->vorbis_file, -1)-1;
-        }
-        vorbis_comment *vc = ov_comment (&info->vorbis_file, -1);
-        update_vorbis_comments (it, vc, 1);
-    }
     return 0;
 }
 
 static void
 cvorbis_free (DB_fileinfo_t *_info) {
+    trace("cvorbis_free\n");
     ogg_info_t *info = (ogg_info_t *)_info;
     if (info) {
-        if (info->ptrack) {
-            deadbeef->pl_item_unref (info->ptrack);
+        if (info->it) {
+            deadbeef->pl_item_unref (info->it);
         }
+        free(info->channel_map);
+        info->channel_map = NULL;
         if (info->info.file) {
             if (info->vorbis_file.datasource) {
                 ov_clear (&info->vorbis_file);
@@ -311,158 +346,137 @@ cvorbis_free (DB_fileinfo_t *_info) {
     }
 }
 
-static int
-cvorbis_read (DB_fileinfo_t *_info, char *bytes, int size) {
-    ogg_info_t *info = (ogg_info_t *)_info;
-//    trace ("cvorbis_read %d bytes\n", size);
+static void send_event(DB_playItem_t *it, const int event_enum)
+{
+    ddb_event_track_t *event = (ddb_event_track_t *)deadbeef->event_alloc(event_enum);
+    if (event->track = it)
+        deadbeef->pl_item_ref(event->track);
+    deadbeef->event_send((ddb_event_t *)event, 0, 0);
+}
 
-    _info->fmt.channels = info->vi->channels;
-    _info->fmt.samplerate = info->vi->rate;
+static bool
+new_streaming_link(ogg_info_t *info, const int new_link)
+{
+    if (info->cur_bit_stream == 0 && new_link != 1)
+        return false;
+
+    trace("Streaming link changed from %d to %d\n", info->cur_bit_stream, new_link);
+    deadbeef->pl_set_meta_int(info->it, ":TRACKNUM", new_link);
+    update_vorbis_comments(info->it, &info->vorbis_file, new_link);
+    send_event(info->it, DB_EV_SONGSTARTED);
+    send_event(info->it, DB_EV_TRACKINFOCHANGED);
+    deadbeef->sendmessage(DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+    info->cur_bit_stream = new_link;
+
+    vorbis_info *vi = ov_info (&info->vorbis_file, new_link);
+    if (vi && info->info.fmt.channels != vi->channels || info->info.fmt.samplerate != vi->rate) {
+        // Streamer can't do this, so re-init the stream
+        trace("Stream channel count changed from %d to %d\n", info->info.fmt.channels, vi->channels);
+        trace("Stream channel count changed from %d to %d\n", info->info.fmt.samplerate, vi->rate);
+        deadbeef->sendmessage(DB_EV_PAUSE, 0, 0, 0);
+        deadbeef->sendmessage(DB_EV_TOGGLE_PAUSE, 0, 0, 0);
+        return true;
+    }
+
+    return false;
+}
 
-    int samplesize = _info->fmt.channels * _info->fmt.bps / 8;
+static void
+map_channels(int16_t *dest, const int16_t *src, const int16_t *src_end, const uint8_t *map, const int channel_count)
+{
+    while (src < src_end) {
+        for (uint8_t *map_ptr = (uint8_t *)map; map_ptr < map + channel_count; map_ptr++, src++)
+            dest[*map_ptr] = *src;
+        dest += channel_count;
+    }
+}
 
-    if (!info->info.file->vfs->is_streaming ()) {
-        if (info->currentsample + size / samplesize > info->endsample) {
-            size = (info->endsample - info->currentsample + 1) * samplesize;
-            trace ("size truncated to %d bytes, cursample=%d, info->endsample=%d, totalsamples=%d\n", size, info->currentsample, info->endsample, ov_pcm_total (&info->vorbis_file, -1));
-            if (size <= 0) {
-                return 0;
-            }
-        }
+static bool
+is_playing_track(const DB_playItem_t *it)
+{
+    DB_playItem_t *track = deadbeef->streamer_get_playing_track();
+    if (track)
+        deadbeef->pl_item_unref(track);
+    return track == it;
+}
+
+static int
+cvorbis_read (DB_fileinfo_t *_info, char *buffer, int bytes_to_read) {
+    ogg_info_t *info = (ogg_info_t *)_info;
+
+    /* Work round some streamer limitations and infobar issue #22 */
+    if (info->new_track && is_playing_track(info->new_track)) {
+        info->new_track = NULL;
+        send_event(info->it, DB_EV_TRACKINFOCHANGED);
+        info->next_update = -2;
     }
-    else {
-        if (info->ptrack && info->currentsample - info->last_comment_update > 5 * _info->fmt.samplerate) {
-            if (info->ptrack) {
-                info->last_comment_update = info->currentsample;
-                vorbis_comment *vc = ov_comment (&info->vorbis_file, -1);
-                update_vorbis_comments (info->ptrack, vc, 1);
-                ddb_event_track_t *ev = (ddb_event_track_t *)deadbeef->event_alloc (DB_EV_TRACKINFOCHANGED);
-                ev->track = info->ptrack;
-                if (ev->track) {
-                    deadbeef->pl_item_ref (ev->track);
-                }
-                deadbeef->event_send ((ddb_event_t *)ev, 0, 0);
-            }
-            else {
-                info->ptrack = NULL;
-            }
-        }
+
+    /* Don't read past the end of a sub-track */
+    if (deadbeef->pl_get_item_flags(info->it) & DDB_IS_SUBTRACK) {
+        const ogg_int64_t bytes_left = (info->it->endsample - ov_pcm_tell(&info->vorbis_file)) * 2 * _info->fmt.channels;
+        if (bytes_left < bytes_to_read)
+            bytes_to_read = bytes_left;
     }
-//    trace ("cvorbis_read %d bytes[2]\n", size);
-    int initsize = size;
-    long ret;
-    for (;;)
+
+    /* Read until we have enough bytes to satisfy streamer, or there are none left */
+    char map_buffer[info->channel_map ? bytes_to_read : 0];
+    char *ptr = info->channel_map ? map_buffer : buffer;
+    int ret = OV_HOLE;
+    int bytes_read = 0;
+    while ((ret > 0 || ret == OV_HOLE) && bytes_read < bytes_to_read)
     {
-        // read ogg
-        int endianess = 0;
-#if WORDS_BIGENDIAN
-        endianess = 1;
-#endif
+        int new_link = -1;
+        ret=ov_read (&info->vorbis_file, ptr+bytes_read, bytes_to_read-bytes_read, CVORBIS_ENDIANNESS, 2, 1, &new_link);
 
-        if (_info->fmt.channels <= 2 || _info->fmt.channels == 4) {
-            ret=ov_read (&info->vorbis_file, bytes, size, endianess, 2, 1, &info->cur_bit_stream);
-        }
-        else {
-            int16_t temp[size/2];
-            ret=ov_read (&info->vorbis_file, (char *)temp, size, endianess, 2, 1, &info->cur_bit_stream);
-            if (ret > 0) {
-                // remap channels to wav format
-                int idx = _info->fmt.channels - 3;
-                static int remap[4][6] = {
-                    {0,2,1},
-                    {0,1,2,3}, // should not be used
-                    {0,2,1,3,4},
-                    {0,2,1,4,5,3}
-                };
-
-                int i, j;
-                int16_t *src = temp;
-                int n = ret / samplesize;
-                for (i = 0; i < n; i++) {
-                    for (j = 0; j < _info->fmt.channels; j++) {
-                        ((int16_t *)(bytes + samplesize * i))[remap[idx][j]] = src[j];
-                    }
-                    src += _info->fmt.channels;
-                }
-            }
-        }
-        if (ret <= 0)
-        {
-            if (ret < 0) {
-                trace ("ov_read returned %d\n", ret);
-                switch (ret) {
-                case OV_HOLE:
-                    trace ("OV_HOLE\n");
-                    break;
-                case OV_EBADLINK:
-                    trace ("OV_EBADLINK\n");
-                    break;
-                case OV_EINVAL:
-                    trace ("OV_EINVAL\n");
-                    break;
-                }
-            }
-            if (ret == OV_HOLE) {
-                continue;
-            }
-            // error or eof
-            break;
+        if (ret < 0) {
+            trace("cvorbis_read: ov_read returned %d\n", ret);
         }
-        else if (ret < size)
-        {
-            info->currentsample += ret / samplesize;
-            size -= ret;
-            bytes += ret;
+        else if (new_link != info->cur_bit_stream && !ov_seekable(&info->vorbis_file) && new_streaming_link(info, new_link)) {
+            bytes_read = bytes_to_read;
         }
         else {
-            info->currentsample += ret / samplesize;
-            size = 0;
-            break;
+            bytes_read += ret;
         }
-    }
-    _info->readpos = (float)(ov_pcm_tell(&info->vorbis_file)-info->startsample)/info->vi->rate;
-    //trace ("cvorbis_read got %d bytes, readpos %f, info->currentsample %d, ret %d\n", initsize-size, _info->readpos, info->currentsample, ret);
-    deadbeef->streamer_set_bitrate (ov_bitrate (&info->vorbis_file, info->cur_bit_stream)/1000);
-    return initsize - size;
-}
 
-static int
-cvorbis_seek_sample (DB_fileinfo_t *_info, int sample) {
-    ogg_info_t *info = (ogg_info_t *)_info;
-    if (sample < 0) {
-        trace ("vorbis: negative seek sample - ignored, but it is a bug!\n");
-        return -1;
-    }
-    if (!info->info.file) {
-        trace ("vorbis: file is NULL on seek\n");
-        return -1;
+//        trace("cvorbis_read got %d bytes towards %d bytes (%d bytes still required)\n", ret, bytes_to_read, bytes_to_read-bytes_read);
     }
-    trace ("vorbis: seek to sample %d\n");
-    sample += info->startsample;
-    int res = ov_pcm_seek (&info->vorbis_file, sample);
-    if (res != 0 && res != OV_ENOSEEK) {
-        trace ("vorbis: error %x seeking to sample %d\n", sample);
-        return -1;
-    }
-    int tell = ov_pcm_tell (&info->vorbis_file);
-    if (tell != sample) {
-        trace ("oggvorbis: failed to do sample-accurate seek (%d->%d)\n", sample, tell);
+
+    if (info->channel_map)
+        map_channels((int16_t *)buffer, (int16_t *)map_buffer, (int16_t *)(ptr+bytes_read), info->channel_map, _info->fmt.channels);
+
+    _info->readpos = (float)(ov_pcm_tell(&info->vorbis_file) - info->it->startsample) / _info->fmt.samplerate;
+    if (_info->readpos > info->next_update) {
+        const int rate = ov_bitrate_instant(&info->vorbis_file) / 1000;
+        if (rate > 0) {
+            deadbeef->streamer_set_bitrate(rate);
+            info->next_update = info->next_update <= 0 ? info->next_update + 1 : _info->readpos + 5;
+        }
     }
-    trace ("vorbis: seek successful\n")
-    info->currentsample = sample;
-    _info->readpos = (float)(ov_pcm_tell(&info->vorbis_file) - info->startsample)/info->vi->rate;
-    return 0;
+//    trace("cvorbis_read returning %d bytes out of %d\n", bytes_read, bytes_to_read);
+    return bytes_read;
 }
 
 static int
 cvorbis_seek (DB_fileinfo_t *_info, float time) {
     ogg_info_t *info = (ogg_info_t *)_info;
-    return cvorbis_seek_sample (_info, time * info->vi->rate);
+    return cvorbis_seek_sample (_info, time * info->info.fmt.samplerate);
+}
+
+static off_t sample_offset(OggVorbis_File *vorbis_file, const ogg_int64_t sample)
+{
+    if (sample <= 0 || sample == ov_pcm_total(vorbis_file, -1))
+        return 0;
+
+    if (ov_pcm_seek(vorbis_file, sample)) {
+        trace("ov_pcm_seek failed to find sample %lld: %d\n", sample, ov_pcm_seek(vorbis_file, sample));
+        return -1;
+    }
+
+    return ov_raw_tell(vorbis_file);
 }
 
 static DB_playItem_t *
 cvorbis_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
-    // check for validity
     DB_FILE *fp = deadbeef->fopen (fname);
     if (!fp) {
         trace ("vorbis: failed to fopen %s\n", fname);
@@ -471,7 +485,6 @@ cvorbis_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
     int64_t fsize = deadbeef->fgetlength (fp);
     if (fp->vfs->is_streaming ()) {
         DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
-        deadbeef->pl_add_meta (it, "!FILETYPE", "OggVorbis");
         deadbeef->plt_set_item_duration (plt, it, -1);
         deadbeef->pl_add_meta (it, "title", NULL);
         after = deadbeef->plt_insert_item (plt, after, it);
@@ -486,7 +499,6 @@ cvorbis_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
         .tell_func = cvorbis_ftell
     };
     OggVorbis_File vorbis_file;
-    vorbis_info *vi;
     int err = ov_open_callbacks (fp, &vorbis_file, NULL, 0, ovcb);
     if (err != 0) {
         trace ("ov_open_callbacks returned %d\n", err);
@@ -498,8 +510,8 @@ cvorbis_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
     long nstreams = ov_streams (&vorbis_file);
     int currentsample = 0;
     for (int stream = 0; stream < nstreams; stream++) {
-        vi = ov_info (&vorbis_file, stream);
-        if (!vi) { // not a vorbis stream
+        const vorbis_info *vi = ov_info (&vorbis_file, stream);
+        if (!vi) {
             trace ("vorbis: ov_info failed for file %s stream %d\n", fname, stream);
             continue;
         }
@@ -507,32 +519,35 @@ cvorbis_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
         int totalsamples = ov_pcm_total (&vorbis_file, stream);
 
         DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
-        deadbeef->pl_add_meta (it, ":FILETYPE", "OggVorbis");
         deadbeef->pl_set_meta_int (it, ":TRACKNUM", stream);
         deadbeef->plt_set_item_duration (plt, it, duration);
         if (nstreams > 1) {
             it->startsample = currentsample;
-            it->endsample = currentsample + totalsamples;
+            it->endsample = currentsample + totalsamples - 1;
             deadbeef->pl_set_item_flags (it, DDB_IS_SUBTRACK);
         }
 
-        // metainfo
-        vorbis_comment *vc = ov_comment (&vorbis_file, stream);
-        update_vorbis_comments (it, vc, 0);
+        if (update_vorbis_comments (it, &vorbis_file, stream))
+            continue;
         int samplerate = vi->rate;
 
-        char s[100];
-        snprintf (s, sizeof (s), "%lld", fsize);
-        deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
+        const off_t start_offset = sample_offset(&vorbis_file, it->startsample-1);
+        const off_t end_offset = sample_offset(&vorbis_file, it->endsample);
+        char *filetype = NULL;
+        const off_t stream_size = oggedit_vorbis_stream_info(deadbeef->fopen(fname), start_offset, end_offset, &filetype);
+        if (filetype) {
+            deadbeef->pl_replace_meta(it, ":FILETYPE", filetype);
+            free(filetype);
+        }
+        if (stream_size > 0) {
+            set_meta_ll(it, ":STREAM SIZE", stream_size);
+            deadbeef->pl_set_meta_int(it, ":BITRATE", 8.f * samplerate * stream_size / totalsamples / 1000);
+        }
+        set_meta_ll (it, ":FILE_SIZE", fsize);
         deadbeef->pl_add_meta (it, ":BPS", "16");
-        snprintf (s, sizeof (s), "%d", vi->channels);
-        deadbeef->pl_add_meta (it, ":CHANNELS", s);
-        snprintf (s, sizeof (s), "%d", samplerate);
-        deadbeef->pl_add_meta (it, ":SAMPLERATE", s);
-        int br = ov_bitrate (&vorbis_file, stream)/1000;
-        snprintf (s, sizeof (s), "%d", br);
-        deadbeef->pl_add_meta (it, ":BITRATE", s);
-
+        deadbeef->pl_set_meta_int (it, ":CHANNELS", vi->channels);
+        deadbeef->pl_set_meta_int (it, ":SAMPLERATE", samplerate);
+//        deadbeef->pl_set_meta_int (it, ":BITRATE", ov_bitrate (&vorbis_file, stream)/1000);
 
         if (nstreams == 1) {
             DB_playItem_t *cue = deadbeef->plt_insert_cue (plt, after, it, totalsamples, samplerate);
@@ -543,10 +558,12 @@ cvorbis_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
                 return cue;
             }
 
-            // embedded cue
             deadbeef->pl_lock ();
-            const char *cuesheet = deadbeef->pl_find_meta (it, "cuesheet");
-            if (cuesheet) {
+            const char *cuesheet_meta = deadbeef->pl_find_meta (it, "cuesheet");
+            if (cuesheet_meta) {
+                trace("Embedded cuesheet found for %s\n", fname);
+                const char *last_sheet = strstr(cuesheet_meta, DELIMITER);
+                const char *cuesheet = last_sheet ? last_sheet + strlen(DELIMITER) : cuesheet_meta;
                 cue = deadbeef->plt_insert_cue_from_buffer (plt, after, it, cuesheet, strlen (cuesheet), totalsamples, samplerate);
                 if (cue) {
                     deadbeef->pl_unlock ();
@@ -580,11 +597,10 @@ vorbis_stop (void) {
 }
 int
 cvorbis_read_metadata (DB_playItem_t *it) {
-    int err = -1;
     DB_FILE *fp = NULL;
     OggVorbis_File vorbis_file;
     vorbis_info *vi = NULL;
-    
+
     deadbeef->pl_lock ();
     fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
@@ -594,7 +610,7 @@ cvorbis_read_metadata (DB_playItem_t *it) {
     }
     if (fp->vfs->is_streaming ()) {
         trace ("cvorbis_read_metadata: failed to fopen %s\n", deadbeef->pl_find_meta (it, ":URI"));
-        goto error;
+        return -1;
     }
     ov_callbacks ovcb = {
         .read_func = cvorbis_fread,
@@ -605,177 +621,136 @@ cvorbis_read_metadata (DB_playItem_t *it) {
     int res = ov_open_callbacks (fp, &vorbis_file, NULL, 0, ovcb);
     if (res != 0) {
         trace ("cvorbis_read_metadata: ov_open_callbacks returned %d\n", res);
-        goto error;
+        return -1;
     }
     int tracknum = deadbeef->pl_find_meta_int (it, ":TRACKNUM", -1);
     vi = ov_info (&vorbis_file, tracknum);
-    if (!vi) { // not a vorbis stream
+    if (!vi) {
         trace ("cvorbis_read_metadata: failed to ov_open %s\n", deadbeef->pl_find_meta (it, ":URI"));
-        goto error;
-    }
-
-    // metainfo
-    vorbis_comment *vc = ov_comment (&vorbis_file, tracknum);
-    if (vc) {
-        update_vorbis_comments (it, vc, 0);
+        ov_clear (&vorbis_file);
+        return -1;
     }
 
-    err = 0;
-error:
-    if (fp) {
+    if (update_vorbis_comments (it, &vorbis_file, tracknum)) {
         ov_clear (&vorbis_file);
+        return -1;
     }
-    return err;
 
+    ov_clear (&vorbis_file);
+    return 0;
 }
 
-int
-cvorbis_write_metadata (DB_playItem_t *it) {
-    vcedit_state *state = NULL;
-    vorbis_comment *vc = NULL;
-    FILE *fp = NULL;
-    FILE *out = NULL;
-    int err = -1;
-    char outname[PATH_MAX] = "";
-    char fname[PATH_MAX];
-    deadbeef->pl_get_meta (it, ":URI", fname, sizeof (fname));
-
-    struct field {
-        struct field *next;
-        int size;
-        uint8_t data[0];
-    };
-
-    struct field *preserved_fields = NULL;
+static void
+split_tag(vorbis_comment *tags, const char *key, const char *value)
+{
+    if (key && value) {
+        const char *p;
+        while (p = strstr(value, DELIMITER)) {
+            char v[p - value + 1];
+            strncpy(v, value, p-value);
+            v[p-value] = 0;
+            vorbis_comment_add_tag(tags, key, v);
+            value = p + strlen(DELIMITER);
+        }
 
-    state = vcedit_new_state ();
-    if (!state) {
-        trace ("cvorbis_write_metadata: vcedit_new_state failed\n");
-        return -1;
-    }
-    fp = fopen (fname, "rb");
-    if (!fp) {
-        trace ("cvorbis_write_metadata: failed to read metadata from %s\n", fname);
-        goto error;
-    }
-    if (vcedit_open (state, fp) != 0) {
-        trace ("cvorbis_write_metadata: vcedit_open failed, error: %s\n", vcedit_error (state));
-        goto error;
+        vorbis_comment_add_tag(tags, key, value);
     }
+}
 
-    vc = vcedit_comments (state);
-    if (!vc) {
-        trace ("cvorbis_write_metadata: vcedit_comments failed, error: %s\n", vcedit_error (state));
-        goto error;
+static void
+merge_gain_tag(DB_playItem_t *it, vorbis_comment *vc, vorbis_comment *tags, const int tag_enum, const char *pattern, const int min, const int max)
+{
+    const char *key = gain_tag_name(tag_enum);
+
+    char *end;
+    const char *meta_value = deadbeef->pl_find_meta(it, key);
+    const float value = meta_value ? strtof(meta_value, &end) : 0;
+    if (meta_value && end != meta_value && value > min && value < max) {
+        char tag_value[10];
+        sprintf(tag_value, pattern, value);
+        vorbis_comment_add_tag(tags, key, tag_value);
     }
-
-#if 0
-    // copy all unknown fields to separate buffer
-    for (int i = 0; i < vc->comments; i++) {
-        int m;
-        for (m = 0; metainfo[m]; m += 2) {
-            int l = strlen (metainfo[m]);
-            if (vc->comment_lengths[i] > l && !strncasecmp (vc->user_comments[i], metainfo[m], l) && vc->user_comments[i][l] == '=') {
-                break;
-            }
-        }
-        if (!metainfo[m]) {
-            trace ("preserved field: %s\n", vc->user_comments[i]);
-            // unknown field
-            struct field *f = malloc (sizeof (struct field) + vc->comment_lengths[i]);
-            memset (f, 0, sizeof (struct field));
-            memcpy (f->data, vc->user_comments[i], vc->comment_lengths[i]);
-            f->size = vc->comment_lengths[i];
-            f->next = preserved_fields;
-            preserved_fields = f;
-        }
+    else {
+        const char *tag_value = vorbis_comment_query(vc, key, 0);
+        if (tag_value)
+             vorbis_comment_add_tag(tags, key, tag_value);
     }
-#endif
+}
+
+static vorbis_comment
+*tags_list(DB_playItem_t *it, OggVorbis_File *vorbis_file)
+{
+    vorbis_comment *vc = ov_comment (vorbis_file, -1);
+    if (!vc)
+        return NULL;
 
-    vorbis_comment_clear(vc);
-    vorbis_comment_init(vc);
+    vorbis_comment *tags = calloc(1, sizeof(vorbis_comment));
+    if (!tags)
+        return NULL;
 
-    // add unknown/custom fields
     deadbeef->pl_lock ();
-    DB_metaInfo_t *m = deadbeef->pl_get_metadata_head (it);
-    while (m) {
-        if (m->key[0] != ':') {
-            int i;
-            for (i = 0; metainfo[i]; i += 2) {
-                if (!strcasecmp (metainfo[i+1], m->key)) {
-                    break;
-                }
-            }
-            const char *val = m->value;
-            if (val && *val) {
-                while (val) {
-                    const char *next = strchr (val, '\n');
-                    int l;
-                    if (next) {
-                        l = next - val;
-                        next++;
-                    }
-                    else {
-                        l = strlen (val);
-                    }
-                    if (l > 0) {
-                        char s[100+l+1];
-                        int n = snprintf (s, sizeof (s), "%s=", metainfo[i] ? metainfo[i] : m->key);
-                        strncpy (s+n, val, l);
-                        *(s+n+l) = 0;
-                        vorbis_comment_add (vc, s);
-                    }
-                    val = next;
-                }
-            }
+    merge_gain_tag(it, vc, tags, DDB_REPLAYGAIN_ALBUMGAIN, "%0.2f dB", -100, 100);
+    merge_gain_tag(it, vc, tags, DDB_REPLAYGAIN_ALBUMPEAK, "%0.8f", 0, 2);
+    merge_gain_tag(it, vc, tags, DDB_REPLAYGAIN_TRACKGAIN, "%0.2f dB", -100, 100);
+    merge_gain_tag(it, vc, tags, DDB_REPLAYGAIN_TRACKPEAK, "%0.8f", 0, 2);
+    merge_gain_tag(it, vc, tags, RG_REFERENCE_LOUDNESS, "%0.1f dB", 0, 128);
+    for (DB_metaInfo_t *m = deadbeef->pl_get_metadata_head(it); m; m = m->next) {
+        char *key = strdup(m->key);
+        if (key && key[0] != ':' && key[0] != '!' && !is_special_tag(key)) {
+            split_tag(tags, oggedit_map_tag(key, "meta2tag"), m->value);
+            free(key);
         }
-        m = m->next;
     }
     deadbeef->pl_unlock ();
-    // add preserved fields
-    for (struct field *f = preserved_fields; f; f = f->next) {
-        vorbis_comment_add (vc, f->data);
-    }
 
-    snprintf (outname, sizeof (outname), "%s.temp.ogg", fname);
+    return tags;
+}
 
+static int
+cvorbis_write_metadata (DB_playItem_t *it) {
+    char fname[PATH_MAX];
+    deadbeef->pl_get_meta (it, ":URI", fname, sizeof (fname));
 
-    out = fopen (outname, "w+b");
-    if (!out) {
-        trace ("cvorbis_write_metadata: failed to open %s for writing\n", outname);
-        goto error;
+    DB_FILE *fp = deadbeef->fopen (fname);
+    if (!fp) {
+        trace ("cvorbis_write_metadata: failed to fopen %s\n", fname);
+        return -1;
     }
-
-    if (vcedit_write (state, out) < 0) {
-        trace ("cvorbis_write_metadata: failed to write tags to %s, error: %s\n", fname, vcedit_error (state));
-        goto error;
+    ov_callbacks ovcb = {
+        .read_func = cvorbis_fread,
+        .seek_func = cvorbis_fseek,
+        .close_func = cvorbis_fclose,
+        .tell_func = cvorbis_ftell
+    };
+    OggVorbis_File vorbis_file;
+    int err = ov_test_callbacks (fp, &vorbis_file, NULL, 0, ovcb);
+    if (err != 0) {
+        trace ("ov_test_callbacks returned %d\n", err);
+        deadbeef->fclose (fp);
+        return -1;
     }
 
-    err = 0;
-error:
-    if (fp) {
-        fclose (fp);
-    }
-    if (out) {
-        fclose (out);
-    }
-    if (state) {
-        vcedit_clear (state);
-    }
-    while (preserved_fields) {
-        struct field *next = preserved_fields->next;
-        free (preserved_fields);
-        preserved_fields = next;
+    vorbis_comment *tags = tags_list(it, &vorbis_file);
+    ov_clear(&vorbis_file);
+    if (!tags) {
+        trace("cvorbis_write_metadata: tags list allocation failed\n");
+        return -1;
     }
 
-    if (!err) {
-        rename (outname, fname);
-    }
-    else if (out) {
-        unlink (outname);
+    deadbeef->pl_lock();
+    const char *stream_size_string = deadbeef->pl_find_meta(it, ":STREAM SIZE");
+    const size_t stream_size = stream_size_string ? (off_t)atoll(stream_size_string) : 0;
+    deadbeef->pl_unlock();
+    const off_t file_size = oggedit_write_vorbis_metadata (deadbeef->fopen(fname), fname, 0, stream_size, tags->comments, tags->user_comments);
+    vorbis_comment_clear(tags);
+    free(tags);
+    if (file_size <= 0) {
+        trace ("cvorbis_write_metadata: failed to write tags to %s, code %d\n", fname, file_size);
+        return -1;
     }
 
-    return err;
+    set_meta_ll(it, ":FILE_SIZE", (int64_t)file_size);
+    return cvorbis_read_metadata(it);
 }
 
 
@@ -791,22 +766,62 @@ static DB_decoder_t plugin = {
     .plugin.id = "stdogg",
     .plugin.name = "OggVorbis decoder",
     .plugin.descr = "OggVorbis decoder using standard xiph.org libraries",
-    .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
-        "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
-        "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
-        "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+    .plugin.copyright =
+    "OggVorbis plugin for DeaDBeeF\n"
+    "Copyright (C) 2009-2014 Alexey Yakovenko et al.\n"
+    "\n"
+    "vcedit.c\n"
+    "Ogg Vorbis plugin Ogg edit functions\n"
+    "\n"
+    "Copyright (C) 2014 Ian Nartowicz <deadbeef at nartowicz.co.uk>\n"
+    "This software is provided 'as-is', without any express or implied\n"
+    "warranty.  In no event will the authors be held liable for any damages\n"
+    "arising from the use of this software.\n"
+    "\n"
+    "Permission is granted to anyone to use this software for any purpose,\n"
+    "including commercial applications, and to alter it and redistribute it\n"
+    "freely, subject to the following restrictions:\n"
+    "\n"
+    "1. The origin of this software must not be misrepresented; you must not\n"
+    " claim that you wrote the original software. If you use this software\n"
+    " in a product, an acknowledgment in the product documentation would be\n"
+    " appreciated but is not required.\n"
+    "\n"
+    "2. Altered source versions must be plainly marked as such, and must not be\n"
+    " misrepresented as being the original software.\n"
+    "\n"
+    "3. This notice may not be removed or altered from any source distribution.\n"
+    "\n"
+    "\n"
+    "\n"
+    "Uses libogg,libvorbis Copyright (c) 2002, Xiph.org Foundation\n"
+    "\n"
+    "Redistribution and use in source and binary forms, with or without\n"
+    "modification, are permitted provided that the following conditions\n"
+    "are met:\n"
+    "\n"
+    "- Redistributions of source code must retain the above copyright\n"
+    "notice, this list of conditions and the following disclaimer.\n"
+    "\n"
+    "- Redistributions in binary form must reproduce the above copyright\n"
+    "notice, this list of conditions and the following disclaimer in the\n"
+    "documentation and/or other materials provided with the distribution.\n"
+    "\n"
+    "- Neither the name of the DeaDBeeF Player nor the names of its\n"
+    "contributors may be used to endorse or promote products derived from\n"
+    "this software without specific prior written permission.\n"
+    "\n"
+    "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n"
+    "``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n"
+    "LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n"
+    "A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR\n"
+    "CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,\n"
+    "EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,\n"
+    "PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR\n"
+    "PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n"
+    "LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\n"
+    "NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n"
+    "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .plugin.start = vorbis_start,
diff --git a/plugins/vtx/COPYING b/plugins/vtx/COPYING
new file mode 100644
index 0000000..ea87d13
--- /dev/null
+++ b/plugins/vtx/COPYING
@@ -0,0 +1,38 @@
+VTX plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+libayemu (C) 2005-2008 Alexander Sashnov
+
+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.
diff --git a/plugins/vtx/Makefile.am b/plugins/vtx/Makefile.am
index 02d8de5..9dec320 100644
--- a/plugins/vtx/Makefile.am
+++ b/plugins/vtx/Makefile.am
@@ -2,7 +2,7 @@ if HAVE_VTX
 vtxdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = vtx.la
 vtx_la_SOURCES = vtx.c ay8912.c ayemu_8912.h ayemu.h ayemu_vtxfile.h lh5dec.c vtxfile.c
-vtx_la_LDFLAGS = -module
+vtx_la_LDFLAGS = -module -avoid-version
 
 AM_CFLAGS = $(CFLAGS) -std=c99
 endif
diff --git a/plugins/vtx/Makefile.in b/plugins/vtx/Makefile.in
index 846c9a2..a3df1a6 100644
--- a/plugins/vtx/Makefile.in
+++ b/plugins/vtx/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/vtx
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -115,23 +143,48 @@ am__vtx_la_SOURCES_DIST = vtx.c ay8912.c ayemu_8912.h ayemu.h \
 @HAVE_VTX_TRUE at am_vtx_la_OBJECTS = vtx.lo ay8912.lo lh5dec.lo \
 @HAVE_VTX_TRUE@	vtxfile.lo
 vtx_la_OBJECTS = $(am_vtx_la_OBJECTS)
-vtx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(vtx_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+vtx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(vtx_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_VTX_TRUE at am_vtx_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(vtx_la_SOURCES)
 DIST_SOURCES = $(am__vtx_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -139,6 +192,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -165,6 +235,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -185,10 +256,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -211,6 +284,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -264,6 +338,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -282,6 +357,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -307,13 +384,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -322,7 +403,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -383,7 +466,7 @@ top_srcdir = @top_srcdir@
 @HAVE_VTX_TRUE at vtxdir = $(libdir)/$(PACKAGE)
 @HAVE_VTX_TRUE at pkglib_LTLIBRARIES = vtx.la
 @HAVE_VTX_TRUE at vtx_la_SOURCES = vtx.c ay8912.c ayemu_8912.h ayemu.h ayemu_vtxfile.h lh5dec.c vtxfile.c
- at HAVE_VTX_TRUE@vtx_la_LDFLAGS = -module
+ at HAVE_VTX_TRUE@vtx_la_LDFLAGS = -module -avoid-version
 @HAVE_VTX_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
 all: all-am
 
@@ -419,6 +502,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -445,14 +529,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 vtx.la: $(vtx_la_OBJECTS) $(vtx_la_DEPENDENCIES) $(EXTRA_vtx_la_DEPENDENCIES) 
-	$(vtx_la_LINK) $(am_vtx_la_rpath) $(vtx_la_OBJECTS) $(vtx_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(vtx_la_LINK) $(am_vtx_la_rpath) $(vtx_la_OBJECTS) $(vtx_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -466,25 +553,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vtxfile.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -492,26 +579,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -523,15 +599,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -540,6 +612,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -684,19 +771,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/vtx/vtx.c b/plugins/vtx/vtx.c
index 27a1f4b..0761943 100644
--- a/plugins/vtx/vtx.c
+++ b/plugins/vtx/vtx.c
@@ -1,21 +1,28 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
+    VTX plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko
 
-    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.
+    Based on libayemu (C) 2005-2008 Alexander Sashnov
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
+
 #include <stdlib.h>
 #include <string.h>
 #include "../../deadbeef.h"
@@ -309,24 +316,28 @@ static DB_decoder_t plugin = {
     .plugin.name = "VTX player",
     .plugin.descr = "AY8910/12 chip emulator and vtx file player",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "VTX plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+        "\n"
+        "Based on libayemu (C) 2005-2008 Alexander Sashnov\n"
+        "\n"
+        "This software is provided 'as-is', without any express or implied\n"
+        "warranty.  In no event will the authors be held liable for any damages\n"
+        "arising from the use of this software.\n"
         "\n"
-        "Uses libayemu - AY/YM sound chip emulator and music file loader\n"
-        "Copyright (C) 2003-2004 Sashnov Alexander\n"
+        "Permission is granted to anyone to use this software for any purpose,\n"
+        "including commercial applications, and to alter it and redistribute it\n"
+        "freely, subject to the following restrictions:\n"
         "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "1. The origin of this software must not be misrepresented; you must not\n"
+        " claim that you wrote the original software. If you use this software\n"
+        " in a product, an acknowledgment in the product documentation would be\n"
+        " appreciated but is not required.\n"
         "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
+        "2. Altered source versions must be plainly marked as such, and must not be\n"
+        " misrepresented as being the original software.\n"
         "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "3. This notice may not be removed or altered from any source distribution.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .plugin.start = vtx_start,
diff --git a/plugins/vtx/vtxfile.c b/plugins/vtx/vtxfile.c
index ff9914e..04978a0 100644
--- a/plugins/vtx/vtxfile.c
+++ b/plugins/vtx/vtxfile.c
@@ -11,6 +11,9 @@
 
 #include "ayemu.h"
 
+//#define trace(...) { fprintf (stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+
 #define AYEMU_VTX_STRING_MAX 254
 
 typedef const char * data_ptr_t;
@@ -97,7 +100,7 @@ static data_ptr_t read_header(data_ptr_t buf, ayemu_vtx_t **target, size_t size)
   else if (strncmp (hdr, "ym", 2) == 0)
     vtx->chiptype = AYEMU_YM;
   else {
-    fprintf (stderr, "File is _not_ VORTEX format!\n"
+    trace ("File is _not_ VORTEX format!\n"
 	     "It not begins with 'ay' or 'ym' string.\n");
     goto clean_and_ret_null;
   }
@@ -127,7 +130,7 @@ static data_ptr_t read_header(data_ptr_t buf, ayemu_vtx_t **target, size_t size)
 
 ayemu_vtx_t * ayemu_vtx_header(data_ptr_t buf, size_t size)
 {
-  ayemu_vtx_t *vtx;
+  ayemu_vtx_t *vtx = NULL;
 
   const char *data;
 
diff --git a/plugins/wavpack/COPYING b/plugins/wavpack/COPYING
index f1cf001..0211e42 100644
--- a/plugins/wavpack/COPYING
+++ b/plugins/wavpack/COPYING
@@ -1,6 +1,6 @@
 WavPack plugin for DeaDBeeF Player
 Copyright (C) 2009-2011, Alexey Yakovenko <waker at users.sourceforge.net>
-With contributions from David Bryant <david at wavpack.com>
+Copyright (C) 2010-2011, David Bryant <david at wavpack.com>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/plugins/wavpack/Makefile.am b/plugins/wavpack/Makefile.am
index 10f44cf..17651ee 100644
--- a/plugins/wavpack/Makefile.am
+++ b/plugins/wavpack/Makefile.am
@@ -2,8 +2,8 @@ if HAVE_WAVPACK
 wavpackdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = wavpack.la
 wavpack_la_SOURCES = wavpack.c
-wavpack_la_LDFLAGS = -module
+wavpack_la_LDFLAGS = -module -avoid-version
 
 wavpack_la_LIBADD = $(LDADD) $(WAVPACK_LIBS)
-AM_CFLAGS = $(CFLAGS) -std=c99
+AM_CFLAGS = $(CFLAGS) $(WAVPACK_CFLAGS) -std=c99
 endif
diff --git a/plugins/wavpack/Makefile.in b/plugins/wavpack/Makefile.in
index cdbfbef..9c27c7b 100644
--- a/plugins/wavpack/Makefile.in
+++ b/plugins/wavpack/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/wavpack
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -114,23 +142,48 @@ am__DEPENDENCIES_1 =
 am__wavpack_la_SOURCES_DIST = wavpack.c
 @HAVE_WAVPACK_TRUE at am_wavpack_la_OBJECTS = wavpack.lo
 wavpack_la_OBJECTS = $(am_wavpack_la_OBJECTS)
-wavpack_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+wavpack_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(wavpack_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_WAVPACK_TRUE at am_wavpack_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(wavpack_la_SOURCES)
 DIST_SOURCES = $(am__wavpack_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,6 +191,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -164,6 +234,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -184,10 +255,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -210,6 +283,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -263,6 +337,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -281,6 +356,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -306,13 +383,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -321,7 +402,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -382,9 +465,9 @@ top_srcdir = @top_srcdir@
 @HAVE_WAVPACK_TRUE at wavpackdir = $(libdir)/$(PACKAGE)
 @HAVE_WAVPACK_TRUE at pkglib_LTLIBRARIES = wavpack.la
 @HAVE_WAVPACK_TRUE at wavpack_la_SOURCES = wavpack.c
- at HAVE_WAVPACK_TRUE@wavpack_la_LDFLAGS = -module
+ at HAVE_WAVPACK_TRUE@wavpack_la_LDFLAGS = -module -avoid-version
 @HAVE_WAVPACK_TRUE at wavpack_la_LIBADD = $(LDADD) $(WAVPACK_LIBS)
- at HAVE_WAVPACK_TRUE@AM_CFLAGS = $(CFLAGS) -std=c99
+ at HAVE_WAVPACK_TRUE@AM_CFLAGS = $(CFLAGS) $(WAVPACK_CFLAGS) -std=c99
 all: all-am
 
 .SUFFIXES:
@@ -419,6 +502,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -445,14 +529,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 wavpack.la: $(wavpack_la_OBJECTS) $(wavpack_la_DEPENDENCIES) $(EXTRA_wavpack_la_DEPENDENCIES) 
-	$(wavpack_la_LINK) $(am_wavpack_la_rpath) $(wavpack_la_OBJECTS) $(wavpack_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(wavpack_la_LINK) $(am_wavpack_la_rpath) $(wavpack_la_OBJECTS) $(wavpack_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -463,25 +550,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wavpack.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,26 +576,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +596,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +609,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -681,19 +768,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/wavpack/wavpack.c b/plugins/wavpack/wavpack.c
index c28478c..0b9f9ac 100644
--- a/plugins/wavpack/wavpack.c
+++ b/plugins/wavpack/wavpack.c
@@ -1,30 +1,30 @@
 /*
-WavPack plugin for DeaDBeeF Player
-Copyright (C) 2009-2011, Alexey Yakovenko <waker at users.sourceforge.net>
-Copyright (C) 2010-2011, David Bryant <david at wavpack.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the <organization> nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    WavPack plugin for DeaDBeeF Player
+    Copyright (C) 2009-2011, Alexey Yakovenko <waker at users.sourceforge.net>
+    Copyright (C) 2010-2011, David Bryant <david at wavpack.com>
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+        * Redistributions of source code must retain the above copyright
+          notice, this list of conditions and the following disclaimer.
+        * Redistributions in binary form must reproduce the above copyright
+          notice, this list of conditions and the following disclaimer in the
+          documentation and/or other materials provided with the distribution.
+        * Neither the name of the <organization> nor the
+          names of its contributors may be used to endorse or promote products
+          derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <string.h>
diff --git a/plugins/wildmidi/COPYING b/plugins/wildmidi/COPYING
index 45645b4..75a2895 100644
--- a/plugins/wildmidi/COPYING
+++ b/plugins/wildmidi/COPYING
@@ -1,340 +1,43 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+WildMidi plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Alexey Yakovenko
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-			    Preamble
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
 
-  When we speak of free software, we are referring to freedom, 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 or use pieces of it
-in new free programs; and that you know you can do these things.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+3. This notice may not be removed or altered from any source distribution.
 
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+wildmidi_lib.c
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+Midi Wavetable Processing library
 
-  The precise terms and conditions for copying, distribution and
-modification follow.
-

-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+Copyright (C)2001-2004 Chris Ison
+Modifications for DeaDBeeF (C) Alexey Yakovenko
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+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.
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+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.
 
-  1. You may copy and distribute verbatim copies of the Program's
-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 give any other recipients of the Program a copy of this License
-along with the Program.
-
-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 Program or any portion
-of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-

-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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 Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) 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; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, 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 executable.  However, as a
-special exception, the source code 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.
-
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-

-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
-
-  5. 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 Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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 to
-this License.
-
-  7. 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 Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
-
-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.
-

-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 Program
-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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-

-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  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 program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
diff --git a/plugins/wildmidi/Makefile.am b/plugins/wildmidi/Makefile.am
index 4a22162..49c937f 100644
--- a/plugins/wildmidi/Makefile.am
+++ b/plugins/wildmidi/Makefile.am
@@ -7,7 +7,7 @@ pkglib_LTLIBRARIES = wildmidi.la
 
 wildmidi_la_SOURCES = wildmidiplug.c src/wildmidi_lib.c include/wildmidi_lib.h
 
-wildmidi_la_LDFLAGS = -module
+wildmidi_la_LDFLAGS = -module -avoid-version
 wildmidi_la_LIBADD = -lm
 
 AM_CFLAGS = $(CFLAGS) -std=c99 -I$(wildmidipath)/include -DWILDMIDI_VERSION=\"0.2.2\" -DWILDMIDILIB_VERSION=\"0.2.2\" -DTIMIDITY_CFG=\"/etc/timidity.conf\" -fPIC
diff --git a/plugins/wildmidi/Makefile.in b/plugins/wildmidi/Makefile.in
index 4b8f71a..fda5045 100644
--- a/plugins/wildmidi/Makefile.in
+++ b/plugins/wildmidi/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,8 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/wildmidi
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	COPYING
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -116,23 +143,48 @@ am__wildmidi_la_SOURCES_DIST = wildmidiplug.c src/wildmidi_lib.c \
 @HAVE_WILDMIDI_TRUE at am_wildmidi_la_OBJECTS = wildmidiplug.lo \
 @HAVE_WILDMIDI_TRUE@	wildmidi_lib.lo
 wildmidi_la_OBJECTS = $(am_wildmidi_la_OBJECTS)
-wildmidi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+wildmidi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(wildmidi_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_WILDMIDI_TRUE at am_wildmidi_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(wildmidi_la_SOURCES)
 DIST_SOURCES = $(am__wildmidi_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -140,6 +192,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -166,6 +235,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -186,10 +256,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -212,6 +284,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -265,6 +338,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -283,6 +357,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -308,13 +384,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -323,7 +403,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -385,7 +467,7 @@ top_srcdir = @top_srcdir@
 @HAVE_WILDMIDI_TRUE at EXTRA_DIST = $(wildmidipath)/README
 @HAVE_WILDMIDI_TRUE at pkglib_LTLIBRARIES = wildmidi.la
 @HAVE_WILDMIDI_TRUE at wildmidi_la_SOURCES = wildmidiplug.c src/wildmidi_lib.c include/wildmidi_lib.h
- at HAVE_WILDMIDI_TRUE@wildmidi_la_LDFLAGS = -module
+ at HAVE_WILDMIDI_TRUE@wildmidi_la_LDFLAGS = -module -avoid-version
 @HAVE_WILDMIDI_TRUE at wildmidi_la_LIBADD = -lm
 @HAVE_WILDMIDI_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -I$(wildmidipath)/include -DWILDMIDI_VERSION=\"0.2.2\" -DWILDMIDILIB_VERSION=\"0.2.2\" -DTIMIDITY_CFG=\"/etc/timidity.conf\" -fPIC
 all: all-am
@@ -422,6 +504,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -448,14 +531,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 wildmidi.la: $(wildmidi_la_OBJECTS) $(wildmidi_la_DEPENDENCIES) $(EXTRA_wildmidi_la_DEPENDENCIES) 
-	$(wildmidi_la_LINK) $(am_wildmidi_la_rpath) $(wildmidi_la_OBJECTS) $(wildmidi_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(wildmidi_la_LINK) $(am_wildmidi_la_rpath) $(wildmidi_la_OBJECTS) $(wildmidi_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -467,32 +553,32 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wildmidiplug.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 wildmidi_lib.lo: src/wildmidi_lib.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wildmidi_lib.lo -MD -MP -MF $(DEPDIR)/wildmidi_lib.Tpo -c -o wildmidi_lib.lo `test -f 'src/wildmidi_lib.c' || echo '$(srcdir)/'`src/wildmidi_lib.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/wildmidi_lib.Tpo $(DEPDIR)/wildmidi_lib.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/wildmidi_lib.c' object='wildmidi_lib.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wildmidi_lib.lo -MD -MP -MF $(DEPDIR)/wildmidi_lib.Tpo -c -o wildmidi_lib.lo `test -f 'src/wildmidi_lib.c' || echo '$(srcdir)/'`src/wildmidi_lib.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wildmidi_lib.Tpo $(DEPDIR)/wildmidi_lib.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/wildmidi_lib.c' object='wildmidi_lib.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wildmidi_lib.lo `test -f 'src/wildmidi_lib.c' || echo '$(srcdir)/'`src/wildmidi_lib.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wildmidi_lib.lo `test -f 'src/wildmidi_lib.c' || echo '$(srcdir)/'`src/wildmidi_lib.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -500,26 +586,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -531,15 +606,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -548,6 +619,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -692,19 +778,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/wildmidi/wildmidiplug.c b/plugins/wildmidi/wildmidiplug.c
index 951d712..920ec93 100644
--- a/plugins/wildmidi/wildmidiplug.c
+++ b/plugins/wildmidi/wildmidiplug.c
@@ -1,22 +1,32 @@
 /*
-    DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-    Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+    WildMidi plugin for DeaDBeeF Player
+    Copyright (C) 2009-2014 Alexey Yakovenko
+
+    Based on wildmidi library
+ 	Midi Wavetable Processing library
+ 	Copyright (C)2001-2004 Chris Ison
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
 
+
+
 #include <stdlib.h>
 #include <string.h>
 #include "../../deadbeef.h"
@@ -193,24 +203,30 @@ DB_decoder_t wmidi_plugin = {
     .plugin.name = "WildMidi player",
     .plugin.descr = "MIDI player based on WildMidi library\n\nRequires freepats package to be installed\nSee http://freepats.zenvoid.org/\nMake sure to set correct freepats.cfg path in plugin settings.",
     .plugin.copyright = 
-        "Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
+        "WildMidi plugin for DeaDBeeF Player\n"
+        "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+        "\n"
+        "Based on wildmidi library\n"
+        "Midi Wavetable Processing library\n"
+        "Copyright (C)2001-2004 Chris Ison\n"
+        "\n"
+        "This software is provided 'as-is', without any express or implied\n"
+        "warranty.  In no event will the authors be held liable for any damages\n"
+        "arising from the use of this software.\n"
         "\n"
-        "Uses modified WildMidi v0.2.2\n"
-        "(C) 2001-2004 Chris Ison\n"
+        "Permission is granted to anyone to use this software for any purpose,\n"
+        "including commercial applications, and to alter it and redistribute it\n"
+        "freely, subject to the following restrictions:\n"
         "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "1. The origin of this software must not be misrepresented; you must not\n"
+        " claim that you wrote the original software. If you use this software\n"
+        " in a product, an acknowledgment in the product documentation would be\n"
+        " appreciated but is not required.\n"
         "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
+        "2. Altered source versions must be plainly marked as such, and must not be\n"
+        " misrepresented as being the original software.\n"
         "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "3. This notice may not be removed or altered from any source distribution.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .plugin.start = wmidi_start,
diff --git a/plugins/wma/COPYING b/plugins/wma/COPYING
new file mode 100644
index 0000000..a422499
--- /dev/null
+++ b/plugins/wma/COPYING
@@ -0,0 +1,60 @@
+WMA plugin for deadbeef
+Copyright (C) 2013 Alexey Yakovenko <waker at users.sourceforge.net>
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+WMA and ASF libraries (C) RockBox & FFMPEG developers
+Modifications for DeaDBeeF (C) Alexey Yakovenko
+
+            __________               __   ___.
+  Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+  Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+  Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+  Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+                    \/            \/     \/    \/            \/
+
+Copyright (C) 2007 Dave Chapman
+
+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 software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+KIND, either express or implied.
+
+
+FFMPEG components
+Copyright (c) 2002 The FFmpeg Project.
+
+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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
diff --git a/plugins/wma/Makefile.am b/plugins/wma/Makefile.am
index 0d6d1eb..48dd441 100644
--- a/plugins/wma/Makefile.am
+++ b/plugins/wma/Makefile.am
@@ -37,7 +37,7 @@ wma_la_SOURCES = wma_plugin.c\
 
 
 
-wma_la_LDFLAGS = -module
+wma_la_LDFLAGS = -module -avoid-version
 
 wma_la_LIBADD = $(LDADD)
 AM_CFLAGS = $(CFLAGS) -std=c99 -I$(wmapath)
diff --git a/plugins/wma/Makefile.in b/plugins/wma/Makefile.in
index d33c936..6744256 100644
--- a/plugins/wma/Makefile.in
+++ b/plugins/wma/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/wma
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -122,23 +150,48 @@ am__wma_la_SOURCES_DIST = wma_plugin.c asfheader.c libasf/asf.c \
 @HAVE_WMA_TRUE@	wmafixed.lo wmadeci.lo fft-ffmpeg.lo \
 @HAVE_WMA_TRUE@	mdct_lookup.lo mdct.lo ffmpeg_bitstream.lo
 wma_la_OBJECTS = $(am_wma_la_OBJECTS)
-wma_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(wma_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+wma_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(wma_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_WMA_TRUE at am_wma_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(wma_la_SOURCES)
 DIST_SOURCES = $(am__wma_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -146,6 +199,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -172,6 +242,7 @@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 COREAUDIO_LIBS = @COREAUDIO_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -192,10 +263,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAAD2_CFLAGS = @FAAD2_CFLAGS@
 FAAD2_LIBS = @FAAD2_LIBS@
 FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
 FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
 FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
 FLAC_LIBS = @FLAC_LIBS@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -218,6 +291,7 @@ HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
 HAVE_YASM = @HAVE_YASM@
+HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -271,6 +345,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -289,6 +364,8 @@ OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -314,13 +391,17 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
 WAVPACK_LIBS = @WAVPACK_LIBS@
 WINDRES = @WINDRES@
 WOE32 = @WOE32@
@@ -329,7 +410,9 @@ XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 YASM_FLAGS = @YASM_FLAGS@
+ZIP_CFLAGS = @ZIP_CFLAGS@
 ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -422,7 +505,7 @@ top_srcdir = @top_srcdir@
 #	libwma-ff/mdct.c\
 #	libwma-ff/fft.c\
 #	libwma-ff/aactab.c
- at HAVE_WMA_TRUE@wma_la_LDFLAGS = -module
+ at HAVE_WMA_TRUE@wma_la_LDFLAGS = -module -avoid-version
 @HAVE_WMA_TRUE at wma_la_LIBADD = $(LDADD)
 @HAVE_WMA_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -I$(wmapath)
 all: all-am
@@ -459,6 +542,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -485,14 +569,17 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 wma.la: $(wma_la_OBJECTS) $(wma_la_DEPENDENCIES) $(EXTRA_wma_la_DEPENDENCIES) 
-	$(wma_la_LINK) $(am_wma_la_rpath) $(wma_la_OBJECTS) $(wma_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(wma_la_LINK) $(am_wma_la_rpath) $(wma_la_OBJECTS) $(wma_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -511,74 +598,74 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wmafixed.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 asf.lo: libasf/asf.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT asf.lo -MD -MP -MF $(DEPDIR)/asf.Tpo -c -o asf.lo `test -f 'libasf/asf.c' || echo '$(srcdir)/'`libasf/asf.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/asf.Tpo $(DEPDIR)/asf.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libasf/asf.c' object='asf.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT asf.lo -MD -MP -MF $(DEPDIR)/asf.Tpo -c -o asf.lo `test -f 'libasf/asf.c' || echo '$(srcdir)/'`libasf/asf.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/asf.Tpo $(DEPDIR)/asf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libasf/asf.c' object='asf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o asf.lo `test -f 'libasf/asf.c' || echo '$(srcdir)/'`libasf/asf.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o asf.lo `test -f 'libasf/asf.c' || echo '$(srcdir)/'`libasf/asf.c
 
 wmafixed.lo: libwma/wmafixed.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wmafixed.lo -MD -MP -MF $(DEPDIR)/wmafixed.Tpo -c -o wmafixed.lo `test -f 'libwma/wmafixed.c' || echo '$(srcdir)/'`libwma/wmafixed.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/wmafixed.Tpo $(DEPDIR)/wmafixed.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libwma/wmafixed.c' object='wmafixed.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wmafixed.lo -MD -MP -MF $(DEPDIR)/wmafixed.Tpo -c -o wmafixed.lo `test -f 'libwma/wmafixed.c' || echo '$(srcdir)/'`libwma/wmafixed.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wmafixed.Tpo $(DEPDIR)/wmafixed.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libwma/wmafixed.c' object='wmafixed.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wmafixed.lo `test -f 'libwma/wmafixed.c' || echo '$(srcdir)/'`libwma/wmafixed.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wmafixed.lo `test -f 'libwma/wmafixed.c' || echo '$(srcdir)/'`libwma/wmafixed.c
 
 wmadeci.lo: libwma/wmadeci.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wmadeci.lo -MD -MP -MF $(DEPDIR)/wmadeci.Tpo -c -o wmadeci.lo `test -f 'libwma/wmadeci.c' || echo '$(srcdir)/'`libwma/wmadeci.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/wmadeci.Tpo $(DEPDIR)/wmadeci.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libwma/wmadeci.c' object='wmadeci.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wmadeci.lo -MD -MP -MF $(DEPDIR)/wmadeci.Tpo -c -o wmadeci.lo `test -f 'libwma/wmadeci.c' || echo '$(srcdir)/'`libwma/wmadeci.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wmadeci.Tpo $(DEPDIR)/wmadeci.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libwma/wmadeci.c' object='wmadeci.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wmadeci.lo `test -f 'libwma/wmadeci.c' || echo '$(srcdir)/'`libwma/wmadeci.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wmadeci.lo `test -f 'libwma/wmadeci.c' || echo '$(srcdir)/'`libwma/wmadeci.c
 
 fft-ffmpeg.lo: libwma/fft-ffmpeg.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fft-ffmpeg.lo -MD -MP -MF $(DEPDIR)/fft-ffmpeg.Tpo -c -o fft-ffmpeg.lo `test -f 'libwma/fft-ffmpeg.c' || echo '$(srcdir)/'`libwma/fft-ffmpeg.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/fft-ffmpeg.Tpo $(DEPDIR)/fft-ffmpeg.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libwma/fft-ffmpeg.c' object='fft-ffmpeg.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fft-ffmpeg.lo -MD -MP -MF $(DEPDIR)/fft-ffmpeg.Tpo -c -o fft-ffmpeg.lo `test -f 'libwma/fft-ffmpeg.c' || echo '$(srcdir)/'`libwma/fft-ffmpeg.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/fft-ffmpeg.Tpo $(DEPDIR)/fft-ffmpeg.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libwma/fft-ffmpeg.c' object='fft-ffmpeg.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fft-ffmpeg.lo `test -f 'libwma/fft-ffmpeg.c' || echo '$(srcdir)/'`libwma/fft-ffmpeg.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fft-ffmpeg.lo `test -f 'libwma/fft-ffmpeg.c' || echo '$(srcdir)/'`libwma/fft-ffmpeg.c
 
 mdct_lookup.lo: libwma/mdct_lookup.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mdct_lookup.lo -MD -MP -MF $(DEPDIR)/mdct_lookup.Tpo -c -o mdct_lookup.lo `test -f 'libwma/mdct_lookup.c' || echo '$(srcdir)/'`libwma/mdct_lookup.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mdct_lookup.Tpo $(DEPDIR)/mdct_lookup.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libwma/mdct_lookup.c' object='mdct_lookup.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mdct_lookup.lo -MD -MP -MF $(DEPDIR)/mdct_lookup.Tpo -c -o mdct_lookup.lo `test -f 'libwma/mdct_lookup.c' || echo '$(srcdir)/'`libwma/mdct_lookup.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mdct_lookup.Tpo $(DEPDIR)/mdct_lookup.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libwma/mdct_lookup.c' object='mdct_lookup.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mdct_lookup.lo `test -f 'libwma/mdct_lookup.c' || echo '$(srcdir)/'`libwma/mdct_lookup.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mdct_lookup.lo `test -f 'libwma/mdct_lookup.c' || echo '$(srcdir)/'`libwma/mdct_lookup.c
 
 mdct.lo: libwma/mdct.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mdct.lo -MD -MP -MF $(DEPDIR)/mdct.Tpo -c -o mdct.lo `test -f 'libwma/mdct.c' || echo '$(srcdir)/'`libwma/mdct.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mdct.Tpo $(DEPDIR)/mdct.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libwma/mdct.c' object='mdct.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mdct.lo -MD -MP -MF $(DEPDIR)/mdct.Tpo -c -o mdct.lo `test -f 'libwma/mdct.c' || echo '$(srcdir)/'`libwma/mdct.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mdct.Tpo $(DEPDIR)/mdct.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libwma/mdct.c' object='mdct.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mdct.lo `test -f 'libwma/mdct.c' || echo '$(srcdir)/'`libwma/mdct.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mdct.lo `test -f 'libwma/mdct.c' || echo '$(srcdir)/'`libwma/mdct.c
 
 ffmpeg_bitstream.lo: libwma/ffmpeg_bitstream.c
- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ffmpeg_bitstream.lo -MD -MP -MF $(DEPDIR)/ffmpeg_bitstream.Tpo -c -o ffmpeg_bitstream.lo `test -f 'libwma/ffmpeg_bitstream.c' || echo '$(srcdir)/'`libwma/ffmpeg_bitstream.c
- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ffmpeg_bitstream.Tpo $(DEPDIR)/ffmpeg_bitstream.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libwma/ffmpeg_bitstream.c' object='ffmpeg_bitstream.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ffmpeg_bitstream.lo -MD -MP -MF $(DEPDIR)/ffmpeg_bitstream.Tpo -c -o ffmpeg_bitstream.lo `test -f 'libwma/ffmpeg_bitstream.c' || echo '$(srcdir)/'`libwma/ffmpeg_bitstream.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ffmpeg_bitstream.Tpo $(DEPDIR)/ffmpeg_bitstream.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libwma/ffmpeg_bitstream.c' object='ffmpeg_bitstream.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ffmpeg_bitstream.lo `test -f 'libwma/ffmpeg_bitstream.c' || echo '$(srcdir)/'`libwma/ffmpeg_bitstream.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ffmpeg_bitstream.lo `test -f 'libwma/ffmpeg_bitstream.c' || echo '$(srcdir)/'`libwma/ffmpeg_bitstream.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -586,26 +673,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -617,15 +693,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -634,6 +706,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -778,19 +865,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/plugins/wma/asfheader.c b/plugins/wma/asfheader.c
index 0001f33..9e12f12 100644
--- a/plugins/wma/asfheader.c
+++ b/plugins/wma/asfheader.c
@@ -392,18 +392,23 @@ static int asf_parse_header(DB_FILE *fd, asf_waveformatex_t* wfx, DB_playItem_t
 {
     asf_object_t current;
     asf_object_t header;
-    uint64_t datalen;
-    int i;
+    uint64_t datalen = 0;
+    int i = 0;
     int fileprop = 0;
-    uint64_t play_duration;
-    uint16_t flags;
-    uint32_t subobjects;
+    uint64_t play_duration = 0;
+    uint16_t flags = 0;
+    uint32_t subobjects = 0;
     uint8_t utf8buf[512];
     int codectype = 0;
     unsigned char id3buffer[2048];
     unsigned char *id3buf = id3buffer;
     int id3buf_remaining = sizeof(id3buffer);
 
+    memset (&current, 0, sizeof (current));
+    memset (&header, 0, sizeof (header));
+    memset (&utf8buf, 0, sizeof (utf8buf));
+    memset (&id3buffer, 0, sizeof (id3buffer));
+
     asf_read_object_header((asf_object_t *) &header, fd);
 
     DEBUGF("header.size=%d\n",(int)header.size);
@@ -746,6 +751,9 @@ static int asf_parse_header(DB_FILE *fd, asf_waveformatex_t* wfx, DB_playItem_t
                             if (type == 0) { // FIXME: custom fields -- after others work
                                 unsigned char *s = id3buf;
                                 asf_utf16LEdecode(fd, length, &id3buf, &id3buf_remaining);
+                                if (!strcmp (utf8buf, "MusicBrainz/Track Id")) {
+                                    strcpy (utf8buf, "musicbrainz_trackid");
+                                }
                                 deadbeef->pl_append_meta (it, utf8buf, s);
                             }
                             else {
diff --git a/plugins/wma/wma_plugin.c b/plugins/wma/wma_plugin.c
index 79d1ad0..8bee83e 100644
--- a/plugins/wma/wma_plugin.c
+++ b/plugins/wma/wma_plugin.c
@@ -1,22 +1,25 @@
 /*
     WMA plugin for deadbeef
-
     Copyright (C) 2013 Alexey Yakovenko <waker at users.sourceforge.net>
     WMA and ASF libraries (C) RockBox & FFMPEG developers
 
-    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.
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
 */
 #include "../../deadbeef.h"
 #ifdef HAVE_CONFIG_H
@@ -60,6 +63,7 @@ typedef struct {
     int skipsamples;
     char buffer[200000]; // can't predict its size, so set to max
     int remaining;
+    int open2_was_used;
 } wmaplug_info_t;
 
 // allocate codec control structure
@@ -68,6 +72,23 @@ wmaplug_open (uint32_t hints) {
     DB_fileinfo_t *_info = malloc (sizeof (wmaplug_info_t));
     wmaplug_info_t *info = (wmaplug_info_t *)_info;
     memset (info, 0, sizeof (wmaplug_info_t));
+
+    return _info;
+}
+
+static DB_fileinfo_t *
+wmaplug_open2 (uint32_t hints, DB_playItem_t *it) {
+    DB_FILE *file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+    if (!file) {
+        return NULL;
+    }
+
+    DB_fileinfo_t *_info = malloc (sizeof (wmaplug_info_t));
+    wmaplug_info_t *info = (wmaplug_info_t *)_info;
+    memset (info, 0, sizeof (wmaplug_info_t));
+    info->open2_was_used = 1;
+    info->info.file = file;
+
     return _info;
 }
 
@@ -77,7 +98,10 @@ static int
 wmaplug_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
     wmaplug_info_t *info = (wmaplug_info_t *)_info;
 
-    info->info.file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+    if (!info->open2_was_used) {
+        info->info.file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+    }
+
     if (!info->info.file) {
         return -1;
     }
@@ -454,7 +478,7 @@ static const char * exts[] = { "wma", NULL };
 // define plugin interface
 static DB_decoder_t plugin = {
     .plugin.api_vmajor = 1,
-    .plugin.api_vminor = 0,
+    .plugin.api_vminor = 7,
     .plugin.version_major = 1,
     .plugin.version_minor = 0,
     .plugin.type = DB_PLUGIN_DECODER,
@@ -463,26 +487,30 @@ static DB_decoder_t plugin = {
     .plugin.descr = "plays WMA files",
     .plugin.copyright = 
         "WMA plugin for deadbeef\n"
-        "\n"
         "Copyright (C) 2013 Alexey Yakovenko <waker at users.sourceforge.net>\n"
         "WMA and ASF libraries (C) RockBox & FFMPEG developers\n"
         "\n"
-        "This program is free software; you can redistribute it and/or\n"
-        "modify it under the terms of the GNU General Public License\n"
-        "as published by the Free Software Foundation; either version 2\n"
-        "of the License, or (at your option) any later version.\n"
+        "This software is provided 'as-is', without any express or implied\n"
+        "warranty.  In no event will the authors be held liable for any damages\n"
+        "arising from the use of this software.\n"
+        "\n"
+        "Permission is granted to anyone to use this software for any purpose,\n"
+        "including commercial applications, and to alter it and redistribute it\n"
+        "freely, subject to the following restrictions:\n"
+        "\n"
+        "1. The origin of this software must not be misrepresented; you must not\n"
+        " claim that you wrote the original software. If you use this software\n"
+        " in a product, an acknowledgment in the product documentation would be\n"
+        " appreciated but is not required.\n"
         "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
+        "2. Altered source versions must be plainly marked as such, and must not be\n"
+        " misrepresented as being the original software.\n"
         "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
+        "3. This notice may not be removed or altered from any source distribution.\n"
     ,
     .plugin.website = "http://deadbeef.sf.net",
     .open = wmaplug_open,
+    .open2 = wmaplug_open2,
     .init = wmaplug_init,
     .free = wmaplug_free,
     .read = wmaplug_read,
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 631d376..87e0958 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -17,7 +17,6 @@ plugins.c
 deadbeef.desktop.in
 intl/plural.c
 plugins/gtkui/deadbeef.glade
-plugins/gtkui/support.c
 plugins/wildmidi/wildmidiplug.c
 translation/extra.c
 plugins/converter/convgui.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 309ee0b..6e5424e 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,6 @@
 plugins/vorbis/vcedit.c
 plugins/gtkui/smclient/eggdesktopfile.c
 plugins/gtkui/smclient/eggsmclient.c
+plugins/pltbrowser/support.c
+plugins/gtkui/support.c
 
diff --git a/po/be.po b/po/be.po
index a6b43c0..0f1386a 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,15 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# Yauhen Bugamol <haxycgm at gmail.com>, 2013
+# Yauhen Bugamol <haxycgm at gmail.com>, 2013
 # Максім Тамковіч <quendimax at tut.by>, 2011
 # Максім Томкавіч <quendimax at tut.by>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:49+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/deadbeef-"
 "player/language/be/)\n"
 "Language: be\n"
@@ -21,17 +23,17 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Пра праграму DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Змены ў DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Перакладчыкі DeaDBeeF"
@@ -88,792 +90,819 @@ msgstr "Абнуліць перадузмацненне"
 msgid "Zero Bands"
 msgstr "Абнуліць частоты"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Профілі"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 дзень %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d дзён %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Стоп | %d трэкаў | %s агульны час"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Мона"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Стэрэа"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d кбіт/с "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Паўза | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dГц | %d біт | %s | %d:%02d / %s | %d трэкаў | %s агульны час"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Новы плэйліст"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Новы плэйліст (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
-msgstr ""
+msgstr "Плэйліст са ўстаўкамі"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
-msgstr ""
+msgstr "Плэйліст"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
-msgstr ""
+msgstr "Падзяляльнік (верху і нізу)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
-msgstr ""
+msgstr "Падзяляльнік (левага і правага)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
-msgstr ""
+msgstr "Укладкі плэйліста"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
-msgstr ""
+msgstr "Паказваць вокладкі альбомаў"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
+msgstr "Кнопка"
+
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Не ўдалося прачытаць файл даведкі"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Не ўдалося загрузіць файл даведкі"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
-msgstr ""
+msgstr "Насамрэч жадаеце выйсці?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Увага"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Файл"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Адкрыць файл(ы)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Дадаць файл(ы)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Дадаць каталог(і)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Дадаць месцазнаходжанне"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Новы плэйліст"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Прачытаць плэйліст"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Запісаць плэйліст"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Выйсцi"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Рэдагаваць"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Ачысціць"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Вылучыць усё"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Зняць вылучэнне"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Інвертаваць вылучэнне"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Вылучэнне"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Сцерці"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Пакінуць вылучанае"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Знайсці"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Назва"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Нумар трэка"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Альбом"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Выканаўца"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Дата"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Выпадкова"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Карыстальніцкі"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Наладкі"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Выгляд"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Радок стану"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Эквалайзер"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "Прай_граванне"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Чарга"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Лінейная"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Перамяшаць трэкі"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Перамяшаць альбомы"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Паўтараць"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
-msgstr ""
+msgstr "Паўтор плэйліста"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
-msgstr ""
+msgstr "Паўтараць адзіны запіс"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
-msgstr ""
+msgstr "Не паўтараць"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Пракручваць плэйліст аўтаматычна"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Вылучаць бягучы трэк"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Спыніць пасля бягучага"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Перайсці на бягучы трэк"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Даведка"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Змены"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Пра праграму"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Перакладчыкі"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Пошук"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Стоп"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Прайграць"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Паўза"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Папярэдняя"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Наступная"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Граць выпадкова"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Пра праграму"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Выйсці"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Даведка"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Уласцівасці трэка"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
-msgstr ""
+msgstr "Месцазнаходжанне"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Настаўленні"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Ужыць"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Замкнуць"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Метаданыя"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Уласцівасці"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Назва:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Увядзіце назву новага слупка"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Тып:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Нумар"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Прайграецца"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Вокладка альбома"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Выканаўца - Альбом"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Працягласць"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Нумар трэка"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Гурт / Выканаўца альбома"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Фармат:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Выраўніванне:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Па леваму краю"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Па праваму краю"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Скасаваць"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Модуль вываду:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Прылада вываду:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Заўсёды канверсаваць 8-біт аўдыё ў 16-біт"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Гук"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Рэжым аўтаўстаноўкі гучнасці:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Адключаны"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Трэк"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Выкарыстоўваць пікавае значэнне"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 дБ"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 дБ"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Перадузмацненне з рыплэйгейна:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Глабальнае перадузмацненне:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Дадаваць файлы з загаднага радка (ці файлавага кіраўніка) у гэты плэйліст:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Узнаўляць папярэдні сеанс пры запуску"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Не дадаваць з архіваў пры праглядзе каталога"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Прайграванне"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Канфігурацыя"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Профіль ланцужкоў DSP"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Чытаць"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Згортваць у трэй замест закрыцця"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Не паказваць іконку у трэі"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Частата абнаўлення інтэрфейсу (разоў за сек.):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Тэкст загалоўка пры прайграванні:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Тэкст загалоўка пры спыненні:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Плагін графічнага інтэрфейсу (змена патрабуе перазапуску):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Прыбраць пункт \"Сцерці з дыска\" з кантэкстнага меню"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Аўтаматычна называць плэйліст, калі дадаецца адзін каталог"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Замяніць"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Пярэдні план"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Фон"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Асноўныя колеры"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Сярэдні"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Светлы"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Цёмны"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Грунтоўны"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Тэкст"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Колеры картак"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Замяніць (губляюцца настаўленні тэмы GTK, але павялічваецца хуткасць "
 "адлюстравання)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Цотны радок"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Няцотны радок"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Вылучаны радок"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Вылучаны тэкст"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Курсор"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Колеры плэйліста"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Колеры"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Уключыць проксі-сервер"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Адрас:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Порт:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Тып проксі:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Імя карыстальніка:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Пароль:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Сетка"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -881,122 +910,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Версія: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Аўтарскія правы"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Дадаткі"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Фармат"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Да павелічэння"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Да памяншэння"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Вылучце плагін DSP"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Плагін"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Настаўленні рэдактара тэгаў"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Пісаць ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Пісаць ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Пісаць APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Выразаць ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Выразаць ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Выразаць APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Версія ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (рэкамендавана)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Знаказбор ID3v1 (прадвызначаны iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Пісать ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1004,91 +1039,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
-msgstr ""
+msgstr "Дадаткі:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Выканаўца / Альбом"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Трэк №"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Дадаць у чаргу"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Выдаліць з чаргі"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Аднавіць метададзеныя"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Выдаліць з жорсткага дыска"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Дадаць слупок"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Рэдагаваць слупок"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Прыбраць слупок"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Групаваць па"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Няма"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Выканаўца/Дата/Альбом"
 
@@ -1105,11 +1149,11 @@ msgstr "Наставіць %s"
 msgid "Default Audio Device"
 msgstr "Прадвызначаная прылада аўдыё"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1117,7 +1161,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Даданне файлаў..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Ініцыялізацыя..."
 
@@ -1130,103 +1174,103 @@ msgid "Really close the window?"
 msgstr "Закрыць акно?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Некалькі велічынь] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Ключ"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Значэнне"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Запісанне тэгаў..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Назва:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Назвы палёў не могуць пачынацца з : ці _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Немагчыма дадаць поле"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Поле з такой назвай ужо ёсць, паспрабуйце назваць інакш."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Дадаць поле"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Сцерці поле"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Опцыі:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  ці  -h     Адлюстраваць даведку (гэты тэкст) і выйсці\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit              Выйсці з плэера\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr ""
 "   --version           Адлюстраваць інфармацыю аб версіі праграмы і выйсці\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play              Пачаць граць\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop              Спыніць прайграванне\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause             Прыпыніць прайграванне\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Пераключыць паўзу\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1234,38 +1278,38 @@ msgstr ""
 "   --play-pause       Пачаць прайграванне, калі спынена, іначай пераключыць "
 "паўзу\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next              Настуная песня ў плэйлісце\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev              Папярэдняя песня ў плэйлісце\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random            Выпадковая песня ў плэлісце\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue             Дадаць файл(ы) у існуючы плэйліст\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT    Адлюстраваць адфарматыраваную назву трэка\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1278,7 +1322,7 @@ msgstr ""
 "каментарый,\n"
 "                       %%r-аўтарскія правы, %%e-пройдзены час\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1287,28 +1331,24 @@ msgstr ""
 "                       Напрыклад: --nowplaying \"%%a - %%t\" павінна вывесці "
 "на экран \"artist - title\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                     за падрабязнымі звесткамі, гл. http://sourceforge.net/"
-"apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Прадвызначана"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Так"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Не"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1334,7 +1374,7 @@ msgstr ""
 "Гурт / Выканаўца альбома\n"
 "Рознае"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1342,7 +1382,7 @@ msgstr ""
 "Левы\n"
 "Правы"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1352,7 +1392,7 @@ msgstr ""
 "Трэк\n"
 "Альбом"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1360,7 +1400,7 @@ msgstr ""
 "Да павелічэння\n"
 "Да памяншэння"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1368,14 +1408,7 @@ msgstr ""
 "2.3 (Рэкамендавана)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Не ўдалося знайсці файл выявы: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1387,7 +1420,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1680,7 +1713,7 @@ msgstr "Аўтаматычная частата дыскрэтызацыі (пе
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1697,35 +1730,40 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Файл ужо існуе. Перапісаць?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Папярэджанне канвертара"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Выберыце кадавальнік"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Памылка кадавальніка"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Пераўтварэнне..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Вылучыць каталог..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Не ўдалося запісаць профіль кадавальніка"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1733,77 +1771,77 @@ msgstr ""
 "Праверце правы доступу каталога, паспрабуйце іншую назву, ці высвабадзіце "
 "месца на дыску"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "Профіль з такой назвай ужо існуе. Паспрабуйце іншую назву."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Памылка"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Дадаць кадавальнік"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Рэдагаваць кадавальнік"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Сцерці профіль"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Гэта дзеянне выдаліць вылучаны профіль. Упэўнены?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Кадавальнікі"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Дадаць плагін у ланцуг DSP"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Не ўдалося запісаць профіль DSP"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Новы профіль DSP"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Рэдагаваць профіль DSP"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "Профілі DSP"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Каталог вываду:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Назва файла вываду:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1813,89 +1851,89 @@ msgstr ""
 "Канчатак файла (напр. mp3) будзе дададзены аўтаматычна.\n"
 "Пакіньце гэта поле пустым для прадвызначэння (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Кадавальнік:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "Профіль DSP:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Колькасць нітак:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Фармат выходнага сэмпла:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Захоўваць фармат крыніцы"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8-біт знакавая цэлая"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16-біт знакавая цэлая"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24-біт знакавая цэлая"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32-біт знакавая цэлая"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32-біт плыўная"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Калі файл існуе:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Спытаць"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Перапісаць"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Рэдагаваць профіль кадавальніка"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Неназваны кадавальнік"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Канчатак файла вываду:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Напр. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Загадны радок:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1905,7 +1943,7 @@ msgstr ""
 "Прыклад: lame - %o\n"
 "%i for input file, %o for output file, - for stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1915,66 +1953,72 @@ msgstr ""
 "<small>%o - назва файла вываду\n"
 "%i - назва файла часовага ўводу</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Метад:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Канвеер"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Часовы файл"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Рэдактар тэгаў</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "Рэдактар профіляў DSP"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Неназваны профіль DSP"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Дадаць"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Не ўдалося знайсці файл выявы: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2002,27 +2046,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
-msgstr ""
+msgstr "Рэдагаваць"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
-msgstr ""
+msgstr "Зачыніць"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
-msgstr ""
+msgstr "Рэдагаваць каманду"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
-msgstr ""
+msgstr "Каманда:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2031,74 +2075,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2106,90 +2150,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
-msgstr ""
+msgstr "Дадаць каманду"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
-msgstr ""
+msgstr "Усе файлы(*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
-msgstr ""
+msgstr "Адкрыць файл(ы)..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
-msgstr ""
+msgstr "Дадаць файл(ы) ў плэйліст..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
-msgstr ""
+msgstr "Дадаць папку(і) ў плэйліст..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2216,102 +2260,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
-msgstr ""
+msgstr "Выняць"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
-msgstr ""
+msgstr "Капіяваць"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
-msgstr ""
+msgstr "Уставіць"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 023cbdf..7f7ad65 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:49+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/deadbeef-"
 "player/language/bg/)\n"
 "Language: bg\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Относно DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s Списък с промени"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Преводачи на DeaDBeeF"
@@ -85,792 +85,819 @@ msgstr "Анулирай предусилвателя"
 msgid "Zero Bands"
 msgstr "Анулирай лентите"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Предварително зададени"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 ден %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d дена %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Спрян | %d песни | %s времетраене"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Моно"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Стерео"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d кбвс"
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Паузиран |"
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr "%s%s %s| %dХц | %d бит | %s | %d:%02d / %s | %d песни | %s времетраене"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Нов Списък"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Нов Списък (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Грешка при четене на помощен файл"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Грешка при зареждане на помощен файл"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Файл"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Отваряне на файл(ове)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Добави файл(ове)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Добави папка/и"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Добави местоположение"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Нов списък"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Зареждане на списък"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Зпаметяване на списъка"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Изход от приложението"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Изчистване"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Маркиране на всички"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Демаркиране на всички"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Обръщане на избора"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Подбиране"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Премахване"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Изрязване"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Търсене"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Заглавие"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Номер на файла"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Албум"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Изпълнител"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Дата"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Произволно"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Предпочитани"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Предпочитания"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Изглед"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Панел на състоянието"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Тонкоректор"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Изпълнява се"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Подредба"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Линейно"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Разбъркване на песни"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Разбъркване на албуми"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Повтаряемост"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Превъртане следва изпълняването"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Курсора следва изпълняването"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Спри след текущото"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Прескачане до текущата песен"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Помощ"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Отчет"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "От_носно"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "П_реводачи"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Търсене"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Спиране"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Пускане"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Паузиране"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Предишна"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Следваща"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Произволно изпълняване"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Относно"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Изход"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Помощ"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Свойства за Песента"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Настройки"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Прилагане"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Затваряне"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Метаданни"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Свойства"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Заглавие:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Име на нова колона:"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Вид:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Индекс на елемента"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Изпълнява се"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Обложка на албума"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Изпълнител - Албум"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Продължителност"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Номер на песента"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Група / Изпълнител на албума"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Формат:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Подравняване:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Ляво"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Дясно"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Отказ"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_Да"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Изходна приставка:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Иходно устройство:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Винаги да се конвертира 8-битов звук в 16-битов"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Звук"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Режим на усилване:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Деактивиране"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Име на файла"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Скала за усилване на максимума"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 дБ"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 дБ"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Режим на усилване:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Усилване за цялата система:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Добавяне на файлове с команда (или файлов мениджър) в този лист за "
 "изпълнение:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "При следващото стартиране, продължи предишната сесия"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Да не се добавят от архиви, когато се добавят папки"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Възпроизвеждане"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Настройване"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Запамети зададеното за DSP (Разпределение на цифровите сигнали)"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "Заре_ждане"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "Разпределение на цифровите сигнали (DSP)"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "При затваряне, минимизирай в панела"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Скрий иконата в таблата"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Опресняване (пъти в секунда):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Заглавен текст при изпълнение:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Заглавен текст при спиране:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Приставка за графичния вид (промяната изисква рестарт):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Скриване на елемент от менюто - \"Изтриване от Диска\""
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 "Автоматично именуване на листа за изпълнение, когато е добавена само една "
 "папка"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Презапис"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "На преден план"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "На фон"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Цвят на бутона за Превъртане/Усилване"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Среден"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Светъл"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Тъмен"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Основен"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Текст"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Цветове на разделната лента"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Презапис (увеличава се производителността, но се губи естетиката)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Четен ред"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Нечетен ред"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Маркираният ред"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Маркираният текст"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Курсор"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Цветове на листа"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Цветове"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Активиране на помощен сървър"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Адрес на помощния сървър:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Порт на помощния сървър:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Вид помощен сървър:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Потребителско име:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Парола:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -878,122 +905,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Версия:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Приставки"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "Адрес:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Формат"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Възходящ"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Низходящ"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Избор на приставка за DSP (разпределение на цифровите сигнали)"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Приставка"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Настройки на редактора на етикети"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Запиши ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Запиши ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Зпаиши APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Лента ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Лента ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Лента APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Версия на ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Препоръчителна)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Транслиране на символите за ID3v1 (по подразбиране е iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Запиши ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1001,91 +1034,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Артист/Албум"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Номер на Песента"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Добави в опашката за изпълнение"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Премахни от опашката за изпълнение"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Презареди метаданните"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Прехани от носителя"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Добавяне на Колона"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Редактиране на Колона"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Премахване на Колона"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Групиране по"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Нищо"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Изпълнител/Дата/Албум"
 
@@ -1102,11 +1144,11 @@ msgstr "Настройване на %s"
 msgid "Default Audio Device"
 msgstr "Аудио устройство по подразбиране"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1114,7 +1156,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Добавяне на файлове..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Разпознаване..."
 
@@ -1127,102 +1169,102 @@ msgid "Really close the window?"
 msgstr "Да се затвори ли прозореца?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Множество стойности]"
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Ключ"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Стойност"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Записване на етикетите..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Име:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Имената на полетата не могат да започват с \":\" или \"_\""
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Не може да бъде добавено поле"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Вече съществува поле със същото име, моля пробвайте с друго!"
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Добавяне на поле"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Премахване на поле"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Опции:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "--help или -h Изписва помощ (това съобщение) и излиза\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "--quit Изход от Плейъра\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "--version Изписва информация за версията и излиза\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "--play Възпроизвеждане\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "--stop Спиране\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "--pause Паузиране\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "--toggle-pause Превключване в\\от режим на пауза\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1230,38 +1272,38 @@ msgstr ""
 "--play-pause Започване на възпроизвеждане, ако е спряно или излизане от "
 "режим на пауза\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "--next Следващата песен в листа\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "--prev Предишната песен в листа\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "--random Произволна песен от листа\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "--queue Прибавяне на файл(ове) в съществуващия лист\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "--nowplaying \"Формат\" Изписва Форматирано име\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1272,35 +1314,31 @@ msgstr ""
 "[b]-Албум, [l]-Времетраене, [n]-Номер на песента,\n"
 "[y]-Година, [c]-Коментар, [r]-Авторски права, [e]-Изминали\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr "пр.: --nowplaying \"%%a - %%t\" ще изведе \"изпълнител - песен\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"За повече информация: http://sourceforge.net/apps/mediawiki/deadbeef/index."
-"php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "По подразбиране"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Да"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Не"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1326,7 +1364,7 @@ msgstr ""
 "Група/Албумен Изпълнител\n"
 "Обичайни"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1334,7 +1372,7 @@ msgstr ""
 "Ляво\n"
 "Дясно"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1344,7 +1382,7 @@ msgstr ""
 "Песен\n"
 "Албум"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1352,7 +1390,7 @@ msgstr ""
 "Възходящо\n"
 "Низходящо"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1360,14 +1398,7 @@ msgstr ""
 "2.3 (Препоръчителна)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Не е открито Х-изображение: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1380,7 +1411,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1674,7 +1705,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1691,35 +1722,40 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Файлът вече съществува. Презипасване?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Внимание при превръщане"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Моля изберете кодиране"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Грешка при превръщане"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Превръщане..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Избор на директория..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Неуспех при записване за избраното кодиране"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1727,77 +1763,77 @@ msgstr ""
 "Проверете правата за избраната папка, пробвайте да изберете друго име на "
 "файла или освободете място на диска."
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "Дублират се имената. Пробвайте да изберете друго име."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Грешка"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Добави ново кодиране"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Редактиране на кодирането"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Премахни зададеното"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Това ще премахне зададения профил. Сигурни ли сте?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Планове за кодиране"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Слагане на добавка в DSP канала"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Неуспех при запаметяване на DSP профила"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Нов DSP профил"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Редактирай DSP профила"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP профили"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Резултатна директория:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Име на резултатния файл:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1808,89 +1844,89 @@ msgstr ""
 "За използване на настройките по подразбиране оставете полето празно (%a - "
 "%t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Кодиране:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP профил:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Брой на нишките:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Формат на резултатната честота:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Запази формата от източника"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8-битов подпис"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16-битов подпис"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24-битов подпис"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32-битов подпис"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32-битов (плаващ)"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Когато файла съществува:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Подсказване"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Презаписване"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Редактиране на профила за кодиране"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Неименуван профил за кодиране"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Разширение на резултатния файл:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Пример: mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Команда:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1901,7 +1937,7 @@ msgstr ""
 "за файла източник \"%i\", за резултатния файл \"%o\", за стандартен източник "
 "\"-\""
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1911,66 +1947,72 @@ msgstr ""
 "<small>\"%o\" - име на резултатен файл\n"
 "име на временния източник - \"%i\"</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Метод:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Поток"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Временен файл"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "Записване на APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "Записване на ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "Записване на ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Създаване на етикети</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "Редактор на DSP профили"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Неозаглавен DSP профил"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Добави"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Не е открито Х-изображение: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1998,27 +2040,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2027,74 +2069,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2102,90 +2144,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2212,102 +2254,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/bn.po b/po/bn.po
index 9f34420..84c1950 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:49+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Bengali (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/bn/)\n"
 "Language: bn\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "DeaDBeeF %s সম্বন্ধে"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s লগপরিবর্তন"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr ""
@@ -87,44 +87,44 @@ msgstr "শূন্য প্রিম্প"
 msgid "Zero Bands"
 msgstr "শূন্য ব্যান্ড"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "প্রথম দিন %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d দিন %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "বন্ধ | %d ট্র্যাকসমুহ | %s সর্বমোট যতটুকু সময় চালানো হয়েছে"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "মোনো"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "স্টেরিও"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps"
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "বিরত | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -132,745 +132,772 @@ msgstr ""
 "%s%s %s| %dHz | %d বিট | %s | %d:%02d / %s | %d ট্র্যাকসমূহ | %s যতটুকু সময় "
 "চালানো হয়েছে"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "নতুন প্লেলিস্ট"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "নতুন প্লেলিস্ট (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "সহায়িকা ফাইল পড়তে ব্যর্থ হয়েছে"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "সহায়িকা ফাইল লোড করতে ব্যর্থ হয়েছে"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "সতর্কবানী"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "ফাইল (_F)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "ফাইল খুলুন (_O)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "ফাইল যোগ করুন"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "ফোল্ডার যোগ করুন"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "অবস্থান যোগ করুন"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "নতুন প্লেলিস্ট"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "প্লেলিস্ট লোড করুন"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "প্লেলিস্ট সংরক্ষণ করুন"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "প্রস্থান করুন (_Q)"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "সম্পাদনা করুন (_Q)"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "মুছে ফেলুন (_C)"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "সব নির্বাচন করুন"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "সব অনির্বাচিত করুন"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "বিপরীতমুখী নির্বাচন"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "নির্বাচন"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "অপসারণ"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "ছাঁটা"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "খুঁজুন (_F)"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "শিরোনাম"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "অ্যালবাম"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "শিল্পী"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "এলোমেলো"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "স্বনির্ধারিত"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "পছন্দসমূহ"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "প্রদর্শন করুন (_V)"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "স্ট্যাটাস বার"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "ইকুয়ালাইজার"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "প্লেব্যাক (_P)"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "ক্রম"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "রৈখিক"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "পুনরাবৃত্তি হচ্ছে"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "স্ক্রল প্লেব্যাককে অনুসরণ করে"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "কার্সার প্লেব্যাককে অনুসরণ করে"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "বর্তমানটি হয়ে যাওয়ার পর থামুন"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "সহায়তা (_H)"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "লগপরিবর্তন (_C)"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "সম্বন্ধে (_A)"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "অনুসন্ধান করুন"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "বন্ধ করুন"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "চালান"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "বিরতি"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "পূর্ববর্তী"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "পরবর্তী"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "এলোমেলোভাবে চালান"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "সম্বন্ধে"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "প্রস্থান করুন"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "সহায়তা"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "ট্র্যাক বৈশিষ্ট্যাবলী"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "প্রয়োগ করুন (_A)"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "বন্ধ করুন (_C)"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "মেটাডাটা"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "বৈশিষ্ট্যাবলী"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "শিরোনাম:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "নতুন কলাম শিরোনাম দিন"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "টাইপ করুন:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr ""
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "চলছে"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "অ্যালবাম শিল্প"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "শিল্পী - অ্যালবাম"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "স্থিতিকাল"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "ব্যান্ড / অ্যালবাম শিল্পী"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "বিন্যাস:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "প্রান্তিককরণ:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "বাম"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "ডান"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "বাতিল (_C)"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "ঠিক আছে (_O)"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "অাউটপুট প্লাগইন:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "অাউটপুট ডিভাইস:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "শব্দ"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "পুনরায় চালানোর মোড:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "নিষ্ক্রিয়"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "ট্র্যাক"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "পুনরায় চালনার সর্বোচ্চ মান"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "কনফিগার"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "ট্রে ছোট করতে বন্ধ করুন"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "উপেক্ষা করা"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "পুরোভূমি"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "পটভূমি"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "সিকবার/ভলিউমবার এর রঙ"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "মধ্যবর্তী"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "হালকা"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "গাঢ়"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "ভিত্তি"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "টেক্সট"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "ট্যাবের অংশের রং"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "উপেক্ষা (GTK ট্রিভিউ থিমিং হারায়, কিন্তু পরিণত করার গতি বাড়ায়)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "জোড় সংখ্যক সারি"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "বিজোড় সংখ্যক সারি"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "নির্বাচিত সারি"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "নির্বাচিত টেক্সট"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "কারসার"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "প্লেলিস্টের রং"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "প্রক্সি সার্ভার সক্রিয় করুন"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "প্রক্সি সার্ভারের ঠিকানা:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "প্রক্সি সার্ভারের পোর্ট:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "প্রক্সির ধরণ:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "প্রক্সি ব্যবহারকাীর নাম:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "প্রক্সি পাসওয়ার্ড:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "নেটওয়ার্ক"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -878,122 +905,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "প্লাগইন"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "ID3v2 লিখুন"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "ID3v1 লিখুন"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "APEv2 লিখুন"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "ID3v2 অংশ"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "ID3v1 অংশ"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "APEv2 অংশ"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 সংস্করণ"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "২.৩ (সুপারিশকৃত)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "২.৪"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 অক্ষর এনকোড করছে (iso8859-1 পূর্বনির্ধারিত)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 লিখুন"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1001,91 +1034,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "শিল্পী / অ্যালবাম"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "ট্র্যাক নং"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "প্লেব্যাকের সারিতে যোগ করুন"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "প্লেব্যাক সারি থেকে অপসারণ করুন"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "মেটাডাটা পুনরায় লোড করুন"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "ডিস্ক থেকে অপসারণ করুন"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "কলাম যোগ করুন"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "কলাম সম্পাদনা করুন"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "কলাম অপসারণ করুন"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "যা অনুসারে গ্রুপ হবে"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "কোনটি না"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "শিল্পী/তারিখ/অ্যালবাম"
 
@@ -1102,11 +1144,11 @@ msgstr ""
 msgid "Default Audio Device"
 msgstr "পূর্বনির্ধারিত অডিও ডিভাইস"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1114,7 +1156,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "ফাইল যোগ করা হচ্ছে..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "আরম্ভ করা হচ্ছে..."
 
@@ -1127,139 +1169,139 @@ msgid "Really close the window?"
 msgstr "সত্যিই উইন্ডোটি বন্ধ করতে চান?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "কী"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "মান"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr ""
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "অপশন:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --সহায়তা  অথবা -h     সহায়তা মুদ্রণ করুন (এই বার্তা) এবং প্রস্থান করুন\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --বন্ধ করুন             প্লেয়ার বন্ধ করুন\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --সংস্করণ          সংস্করণের তথ্য মুদ্রণ করে বন্ধ করুন\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --চালান             প্লেব্যাক শুরু করুন\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --বন্ধ করুন             প্লেব্যাক বন্ধ করুন\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --বিরতি            প্লেব্যাক বিরত রাখুন\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --পরবর্তী             প্লেলিস্টে পরবর্তী গান\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --পূর্ববর্তী             প্লেলিস্টে পূর্ববর্তী গান\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --এলোমেলো           প্লেলিস্টে এলোমেলো গান\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --সারি            বিদ্যমান প্লেলিস্টে সবশেষে যোগ করা ফাইল\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --FMT এখন চলছে   স্ট্যান্ডআউটে বিন্যাসিত ট্র্যাক নাম মুদ্রণ করুন\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1270,7 +1312,7 @@ msgstr ""
 "                      [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 "                      copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1279,26 +1321,24 @@ msgstr ""
 "                      e.g.: --এখন চলছে \"%%a - %%t\" মুদ্রণ হবে \"শিল্পী - "
 "শিরোনাম\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "পূর্বনির্ধারিত"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "হ্যাঁ"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "না"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1313,7 +1353,7 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1321,7 +1361,7 @@ msgstr ""
 "বাম\n"
 "ডান"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1331,13 +1371,13 @@ msgstr ""
 "ট্র্যাক\n"
 "অ্যালবাম"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1345,14 +1385,7 @@ msgstr ""
 "২.৩ (সুপারিশকৃত)‌‌\n"
 "২.৪"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "pixmap ফাইল পায়নি: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1362,7 +1395,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1655,7 +1688,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1672,111 +1705,116 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr ""
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1784,89 +1822,89 @@ msgid ""
 "Leave the field empty for default (%a - %t)."
 msgstr ""
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr ""
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr ""
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1874,7 +1912,7 @@ msgid ""
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1882,66 +1920,72 @@ msgid ""
 "%i - temporary input file name</small>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr ""
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr ""
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr ""
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "যোগ"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "pixmap ফাইল পায়নি: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1969,27 +2013,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -1998,74 +2042,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2073,90 +2117,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2183,102 +2227,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index aa058eb..c91c493 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# vctrflc <chatgren at gmail.com>, 2014
+# vctrflc <chatgren at gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:49+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/ca/)\n"
 "Language: ca\n"
@@ -18,28 +20,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
-msgstr ""
+msgstr "Sobre DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
-msgstr ""
+msgstr "Registre de canvis de DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
-msgstr ""
+msgstr "Traductors de DeaDBeeF"
 
 #: ../plugins/gtkui/eq.c:141
 msgid "Save DeaDBeeF EQ Preset"
-msgstr ""
+msgstr "Desar la config. de l'EQ"
 
 #: ../plugins/gtkui/eq.c:148
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr ""
+msgstr "Fitxers de config. de l'EQ (*.ddbeq)"
 
 #: ../plugins/gtkui/eq.c:187
 msgid "Load DeaDBeeF EQ Preset..."
@@ -75,7 +77,7 @@ msgstr "Activa"
 
 #: ../plugins/gtkui/eq.c:371
 msgid "Zero All"
-msgstr ""
+msgstr "Tots nuls"
 
 #: ../plugins/gtkui/eq.c:378
 msgid "Zero Preamp"
@@ -85,788 +87,816 @@ msgstr ""
 msgid "Zero Bands"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
-msgstr ""
+msgstr "Configs."
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
-msgstr ""
+msgstr "1 dia %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
-msgstr ""
+msgstr "%d dies %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
-msgstr ""
+msgstr "Aturat | %d pistes | %s temps total"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
-msgstr ""
+msgstr "Estèreo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
-msgstr ""
+msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "En pausa |"
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d pistes | %s temps total"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Llista de Reproducció Nova"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Llista de Reproducció Nova (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
-msgstr ""
+msgstr "Playlist amb pestanyes"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Error en la càrrega del fitxer d'ajuda"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Fitxer"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Obre fitxer(s)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Afegeix fitxer(s)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Afegeix fitxer(s)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Afegeix localització"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Nova llista de reproducció"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Carrega la llista de reproducció"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Desa la llista de reproducció"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Surt"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Neteja"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Selecciona-ho tot"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Deselecciona-ho tot"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Inverteix la selecció"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Selecció"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Elimina"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Títol"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Àlbum"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Artista"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Aleatori"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Personalització"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Vista"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Barra d'estat"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Equalitzador"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Reproducció"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Ordre"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Atura't en acabar l'actual"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Registre de Canvis"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Cerca"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Atura"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "En pausa"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Següent"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Reproducció aleatòria"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Sobre"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Surt"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Propietats del tema"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Aplica"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Tanca"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadada"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Propietats"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Títol:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Introduïu un nou títol de columna aquí"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Tipus:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr ""
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Reproduint"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Artista - Àlbum"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Banda / Àlbum Artista"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Alineació:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Esquerra"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Dreta"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_Correcte"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Dispositiu de sortida"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "So"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -874,122 +904,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -997,91 +1033,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr ""
 
@@ -1098,11 +1143,11 @@ msgstr ""
 msgid "Default Audio Device"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1110,7 +1155,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Afegint fitxers..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr ""
 
@@ -1123,139 +1168,139 @@ msgid "Really close the window?"
 msgstr ""
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr ""
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr ""
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr ""
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr ""
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr ""
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr ""
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr ""
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr ""
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr ""
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr ""
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr ""
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr ""
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1263,33 +1308,31 @@ msgid ""
 "                      copy[r]ight, [e]lapsed\n"
 msgstr ""
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr ""
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr ""
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr ""
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1304,39 +1347,32 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
 "Album"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
 msgstr ""
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1346,7 +1382,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1639,7 +1675,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1656,111 +1692,116 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr ""
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1768,89 +1809,89 @@ msgid ""
 "Leave the field empty for default (%a - %t)."
 msgstr ""
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr ""
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr ""
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1858,7 +1899,7 @@ msgid ""
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1866,66 +1907,72 @@ msgid ""
 "%i - temporary input file name</small>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr ""
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr ""
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr ""
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr ""
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1953,27 +2000,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -1982,74 +2029,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2057,90 +2104,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2167,102 +2214,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index af72d82..c43ce9a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# pcpepik <pcpepik0 at gmail.com>, 2013
-# pcpepik <pcpepik0 at gmail.com>, 2013
+# Joe Bliss <pcpepik0 at gmail.com>, 2013
+# Joe Bliss <pcpepik0 at gmail.com>, 2013
 # Vašek Kovářík <l3d9z6 at seznam.cz>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:49+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/cs/)\n"
 "Language: cs\n"
@@ -21,17 +21,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "O aplikaci DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s ChangeLog"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF přeložili"
@@ -88,44 +88,44 @@ msgstr "Vynulovat předzesilovač"
 msgid "Zero Bands"
 msgstr "Vynulovat pásma"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Předvolby"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 den %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dní %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Zastaveno | %d skladeb | %s celkový čas přehrávání"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Zastaveno | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -133,749 +133,774 @@ msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d skladeb | %s celkový čas "
 "přehrávání"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Nový playlist"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nový playlist (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Playlist se záložkami"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Playlist"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "Rozdělovač (nahoře a dole)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "Rozdělovač (vlevo a vpravo)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "Záložky playlistu"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Vlastnosti výběru"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Zobrazit obal alba"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "Křivka"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "Spektrální analyzér"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Tlačítko"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Chyba při čtení souboru nápovědy"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Selhalo načtení souboru nápovědy"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
-"Přehrávač momentálně provádí úlohy na pozadí. Pokud jej nyní ukončíte, úlohy "
-"budou ukončeny či přerušeny. Toto může způsobit ztrátu dat."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "Stále chcete odejít?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Upozornění"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Soubor"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Otevřít soubor(y)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Přidat soubor(y)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Přidat složku(y)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Přidat umístění"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Nový playlist"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Načíst playlist"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Uložit playlist"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Zavřít"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Smazat"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Vybrat vše"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Zrušit výběr"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Invertovat výběr"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Výběr"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Odstranit"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Ořez"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Hledat"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Třídit dle"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Název"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Číslo stopy"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Umělec"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Datum"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Náhodně"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Vlastní"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Stavový řádek"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Ekvalizér"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "Režim návrhu"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Přehrát"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Pořadí"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Lineárně"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Promísit skladby"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Náhodná alba"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Opakování"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Opakovat vše"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Opakovat jednotlivou skladbu"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "Neopakovat"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Posunovat s přehráváním"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Sledovat kurzorem přehrávání"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Zastavit po aktuální"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Přeskočit na aktuální stopu"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_ChangeLog"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_O aplikaci"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Přeložili"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Hledat"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Zastavit"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Přehrát"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Předchozí"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Následující"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Přehrát náhodně"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Info"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Konec"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Nápověda"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Vlastnosti skladby"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "Umístění:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Nastavení"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Použít"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Název:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Zde vložit nový název sloupce"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Rejstřík"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Přehrávání"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Obal alba"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Umělec - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Trvání"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Číslo stopy"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Skupina / Skladatel"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Formát:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Zarovnání:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Vlevo"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Vpravo"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Výstupní zásuvné moduly:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Výstupní zařízení:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Vždy převést 8 bit audio na 16 bit"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Režim replaygain:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Zakázat"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Skladba"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Měřítko vrcholu replaygain"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Předzesilovač replaygain:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Globální předzesilovač (preamp):"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Přidat soubory z příkazové řádky (nebo souborového manažeru) do tohoto "
 "playlistu:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Při startu obnovit předchozí sezení"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Ignorovat archivy během přidávání adresářů"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "Automaticky vynulovat \"Zastavit po aktuální\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Přehrát"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Nastavit"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Předvolba DSP"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Načíst"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Zavřít do traye"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Skrýt ikonu v trayi"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "Povolit detekci a záznam ruského CP1251"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Povolit detekci a záznam čínského CP936"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Četnost obnovení rozhraní (za vteřinu):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Titulní text během přehrávání:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Titulní text během zastavení:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Zásuvný modul GUI (změny vyžadují restart):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Skrýt položku \"Smazat z disku\" z kontextového menu"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Automaticky pojmenovat přidaný adresář"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "GUI/Různé"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Předefinovat"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Popředí"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Pozadí"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Barvy průběhu hledání/hlasitosti"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Střední"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Světlé"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Tmavé"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Základní"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Text"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Barvy lišty záložek"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Předefinovat (ztratí GTK téma, ale zrychlí vykreslování)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Sudý řádek"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Lichý řádek"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Vybraný řádek"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Vybraný text"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Kurzor"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Barvy playlistu"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Barvy"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Povolit server Proxy"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Adresa Proxy serveru:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Port Proxy serveru:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Typ Proxy:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Uživatelské jméno Proxy:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Heslo Proxy:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr "Upravit mapování Typu-Obsahu"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Síť"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr "<Nenastaveno>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "Globální klávesová zkratka"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -883,122 +908,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "Klávesové zkratky"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Verze: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "Seskupit dle ..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "Třídit dle ..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Formát"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Vzestupně"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Sestupně"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Vybrat zásuvný modul DSP"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Zásuvný modul"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Nastavení autora popisku"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Zapsat ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Zapsat ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Zapsat APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Odstranit ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Odstranit ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Odstranit APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Verze ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Doporučeno)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Kódování znaků ID3v1 (výchozí je iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Zapsat ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr "Mapování Typu-Obsahu"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1010,91 +1041,100 @@ msgstr ""
 "obsahu \"audio/x-mpeg\" a vyžadovat dekódování DeaDBeeF zásuvným modulem "
 "\"stdmpg\" nebo \"ffmpeg\"."
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr "Obnovit výchozí"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr "Typ-Obsahu:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "Zásuvné moduly:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Umělec / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Skladba č."
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Přidat do fronty přehrávání"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Odstranit z fronty přehrávání"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Znovu načíst metadata"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Odstranit z disku"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Přidat sloupec"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Upravit sloupec"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Odstranit sloupec"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Seskupit dle"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Žádné"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Umělec/Datum/Album"
 
@@ -1111,11 +1151,11 @@ msgstr "Nastavit %s"
 msgid "Default Audio Device"
 msgstr "Výchozí audio zařízení"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1123,7 +1163,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Přidávají se soubory..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Inicializuje se..."
 
@@ -1136,102 +1176,102 @@ msgid "Really close the window?"
 msgstr "Opravdu zavřít okno?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Vícenásobné hodnoty] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Klávesa"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[Vícenásobné hodnoty] "
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Zapisují se tagy..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "Název pole"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Jméno:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Název pole nesmí začínat : nebo _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Nelze přidat pole"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Pole s tímto názvem již existuje, prosím, zvolte jiný název."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Přidat pole"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Odstranit pole"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "Použití: deadbeef [volby] [--] [soubor(y)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Volby:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  or  -h     Zobrazit nápovědu (tuto zprávu) a ukončit\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Zavřít přehrávač\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Zobrazit verzi a ukončit\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Zahájit přehrávání\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Zastavit přehrávání\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Pauza přehrávání\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Přepnout pauzu\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1239,39 +1279,39 @@ msgstr ""
 "   --play-pause       Spustit přehrávání, pokud je zastaveno, jinak přepnout "
 "pauzu\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Další skladba z playlistu\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Předchozí skladba z playlistu\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Náhodná skladba z playlistu\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Připojit soubor(y) do existujícího playlistu\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 "--gui PLUGIN Určí, který zásuvný modul GUI bude použit, výchozí je \"GTK2\"\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Zapsat zformátovaný název skladby do stdout\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1282,7 +1322,7 @@ msgstr ""
 "                      [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 "                      copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1291,28 +1331,24 @@ msgstr ""
 "                      např.: --nowplaying \"%%a - %%t\" zapíše \"umělec - "
 "název\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      pro další informace navštivte http://sourceforge.net/"
-"apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Výchozí"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Ano"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Ne"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1337,7 +1373,7 @@ msgstr ""
 "Skupina / umělec alba\n"
 "Vlastní"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1345,7 +1381,7 @@ msgstr ""
 "Vlevo\n"
 "Vpravo"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1355,7 +1391,7 @@ msgstr ""
 "Skladba\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1363,7 +1399,7 @@ msgstr ""
 "Vzestupně\n"
 "Sestupně"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1371,14 +1407,7 @@ msgstr ""
 "2.3 (Doporučeno)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Nelze najít pixmap soubor: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1391,8 +1420,8 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "Přidat Audio CD"
+msgid "Add Audio CD"
+msgstr ""
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1685,8 +1714,8 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
-msgstr "Nakonfigurovat vlastní příkazy shellu"
+msgid "Configure Custom Shell Commands"
+msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
@@ -1702,35 +1731,40 @@ msgstr "Upřednostnit emulátor Ken před Satoh (prostorový zvuk nebude fungova
 msgid "Enable surround"
 msgstr "Povolit prostorový zvuk"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Soubor již existuje. Přepsat?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Varování konvertoru"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Vyberte enkodér"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Chyba konvertoru"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Převádí se..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Vybrat adresář..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Selhalo ukládání předvolby enkodéru"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1738,77 +1772,77 @@ msgstr ""
 "Ověřte oprávnění k adresáři předvolby, zvolte jiný název nebo uvolněte místo "
 "na disku"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "Předvolba stejného jména již existuje. Zkuste zvolit jiný název."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Chyba"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Přidat nový enkodér"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Upravit enkodér"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Odstranit předvolbu"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Tato akce odstraní vybranou předvolbu. Pokračovat?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Enkodéry"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Přidat zásuvný modul do řetězce DSP"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Selhalo ukládání předvolby DSP"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Nová předvolba DSP"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Upravit předvolbu DSP"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "Předvolby DSP"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Výstupní adresář:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr "Zapsat do zdrojové složky skladby"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr "Zachovat strukturu adresáře"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Název výstupního souboru:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1818,89 +1852,89 @@ msgstr ""
 "Přípona (např. .mp3) bude připojena automaticky.\n"
 "Ponechte pole prázdné pro výchozí (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Enkodér:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "Předvolba DSP:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Počet vláken:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Výstupní formát vzorku:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Zachovat zdrojový formát"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 bit podepsaný int"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 bit podepsaný int"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 bit podepsaný int"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 bit podepsaný int"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 bit plovoucí"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Pokud soubor existuje:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Prompt"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Přepsat"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Upravit předvolbu enkodéru"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Enkodér bez názvu"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Přípona výstupního souboru:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Např. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Příkazový řádek:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1910,7 +1944,7 @@ msgstr ""
 "Příklad: lame - %o\n"
 "%i pro vstupní soubor, %o pro výstupní soubor, - pro stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1920,66 +1954,72 @@ msgstr ""
 "<small>%o - název výstupního souboru\n"
 "%i - název dočasného vstupního souboru</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Metoda:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Roura"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Dočasný soubor"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Autor popisku</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "Editor předvolby DSP"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Předvolba DSP bez názvu"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Přidat"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nelze najít pixmap soubor: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2017,27 +2057,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr "Vlastní příkazy shellu"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "Upravit"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "Zavřít"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "Upravit příkaz"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "Příkaz:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2049,17 +2089,17 @@ msgstr ""
 "spuštěna hlavní aplikace. Může být použito formátování názvu. Příklad: xdg-"
 "open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "ID:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr "Jakýkoliv název, například \"Můj příkaz shellu\""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
@@ -2068,57 +2108,57 @@ msgstr ""
 "ID příkazu, mělo by to být něco krátkého, například \"youtube_otevřít\". "
 "Musí být unikátní."
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr "Jednotlivé skladby"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "Funguje na jednotlivých skladbách"
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "Více skladeb"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "Funguje na více skladbách"
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "Místní"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "Funguje na místních souborech"
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr "Vzdálený"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr "Funguje na vzdálených souborech (např. streamování http://)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "Položka by se měla objevit v hlavním menu"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2126,72 +2166,72 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Přidat příkaz"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "Smazat"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "Tato akce odstraní vybraný příkaz shellu. Pokračovat?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr "Potvrdit odstranění"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr "ID nesmí zůstat prázdné a musí být unikátní.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr "Název nesmí zůstat prázdný.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr "Příkaz shellu nesmí zůstat prázdný.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "Neplatné hodnoty"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr "Podporované zvukové formáty"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "Všechny soubory  (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr "Otevřít soubor(y)..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr "Přidat soubor(y) do playlistu..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr "Přidat složku(y) do playlistu..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr "Následovat symlinky"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "Smazat soubory z disku"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -2199,19 +2239,19 @@ msgstr ""
 "Soubory budou ztraceny. Pokračovat?\n"
 "(Tento dialog lze vypnout v nastavení zásuvného modulu GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "Načíst playlist"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "Ostatní soubory  (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr "Uložit playlist jako"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Soubory playlistů DeaDBeeF  (*.dbpl)"
 
@@ -2245,102 +2285,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr "Není nic vybráno."
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index b39a732..ec72e6b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/da/)\n"
 "Language: da\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Om DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s - ændringslog"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Oversættere af DeaDBeeF"
@@ -86,44 +86,44 @@ msgstr "Nulstil forforstærkning"
 msgid "Zero Bands"
 msgstr "Nulstil frekvensbånd"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Forhåndsindstillinger"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dag %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dage %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Stoppet | %d numre | %s samlet afspilningstid"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Pause | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -131,747 +131,774 @@ msgstr ""
 "%s%s %s| %d Hz | %d bit | %s | %d:%02d / %s | %d numre | %s samlet "
 "afspilningstid"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Ny afspilningsliste"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Ny afspilningsliste (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Kunne ikke læse hjælpefil"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Kunne ikke indlæse hjælpefil"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Fil"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Åbn filer"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Tilføj filer"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Tilføj mapper"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Tilføj placering"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Ny afspilningsliste"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Indlæs afspilningsliste"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Gem afspilningsliste"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Afslut"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Ryd"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Vælg alle"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Fravælg alle"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Inverter markering"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Markering"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Beskær"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Find"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Titel"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Nummer"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Kunstner"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Dato"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Tilfældig"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Tilpasset"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Vis"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Statusbjælke"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Afspilning"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Rækkefølge"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Lineær"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Bland numre"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Bland albums"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Gentage"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Rul følger afspilning"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Markør følger afspilning"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Stop efter aktuelle"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Spring til aktuelle nummer"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Ændringslog"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Om"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "Oversæ_ttere"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Søg"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Stop"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Afspil"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pause"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Næste"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Afspil tilfældig"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Om"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Afslut"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Hjælp"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Nummeregenskaber"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Anvend"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Luk"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Indtast ny kolonnetitel her"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Type:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Indeks"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Spiller"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Albumomslag"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Kunstner - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Varighed"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Nummer"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Band-/albumkunstner"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Justering:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Venstre"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Højre"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Afbryd"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_O.k."
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Udvidelsesmodul for uddata:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Uddataenhed:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Konverter altid 8-bits lyd til 16-bit"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Lyd"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Replaygains tilstand:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Nummer"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Replaygains niveauskala"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Tilføj filer fra kommandolinje (eller filhåndtering) til afspilningslisten:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Genoptag forrige session ved opstart"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Afspilning"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Konfigurer"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Luk minimeringer til statusfelt"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Skjul statusikon"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Titelbjælketekst under afspilning:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Titelbjælketekst når stoppet:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Skjul kontekstmenupunktet »Slet fra disk«"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Overskriv"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Forgrund"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Baggrund"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Farver for søgebjælke/lydstyrkebjælke"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Midt"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Lys"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Mørk"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Tekst"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Farver for fanebladsfjernelse"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Overskriv (mister tema for GTK-trævisning, men øger optegningshastigheden)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Lige række"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Ulige række"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Markeret række"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Markeret tekst"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Markør"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Farver på afspilningsliste"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Farver"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Aktiver proxyserver"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Adresse for proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Port til proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Proxytype:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Brugernavn til proxy:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Adgangskode til proxy:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Netværk"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -879,122 +906,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Udvidelsesmoduler"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "Internetadresse:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Skriv ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Skriv ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Skriv APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Fjern ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Fjern ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Fjern APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2-version"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Anbefalet)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1-tegnkodning (standard er iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Skriv ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1002,91 +1035,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Kunster / album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Nummer"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Tilføj til afspilningskø"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Fjern fra afspilningskø"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Genindlæs metadata"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Fjern fra disk"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Tilføj kolonne"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Rediger kolonne"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Fjern kolonne"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Grupper efter"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Ingen"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Kunster/dato/album"
 
@@ -1103,11 +1145,11 @@ msgstr ""
 msgid "Default Audio Device"
 msgstr "Standardlydenhed"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1115,7 +1157,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Tilføjer filer..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Initialiserer..."
 
@@ -1128,139 +1170,139 @@ msgid "Really close the window?"
 msgstr "Luk vinduet?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Tast"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Værdi"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr ""
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Tilvalg:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  eller  -h  Vis hjælp (denne besked) og afslut\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Afslut afspiller\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Vis versionsinfo og afslut\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Start afspilning\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Stop afspilning\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Pause afspilning\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Næste sang i afspilningsliste\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Forrige sang i afspilningsliste\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Tilfældig sang i afspilningsliste\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Tilføj filer til eksisterende afspilningsliste\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Vis formateret nummernavn til stdout\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1271,7 +1313,7 @@ msgstr ""
 "                      [l] længde, [n] nummer, [y] år, [c] bemærkning,\n"
 "                      [r] ophavsret, [e] forløbet\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1280,26 +1322,24 @@ msgstr ""
 "                      f.eks.: --nowplaying \"%%a - %%t\" skal vise »kunstner "
 "- titel«\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Standard"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Ja"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Nej"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1314,7 +1354,7 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1322,7 +1362,7 @@ msgstr ""
 "Venstre\n"
 "Højre"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1332,13 +1372,13 @@ msgstr ""
 "Nummer\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1346,14 +1386,7 @@ msgstr ""
 "2.3 (Anbefalet)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Kunne ikke finde pixmapfil: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1366,7 +1399,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1659,7 +1692,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1676,111 +1709,116 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr ""
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1788,89 +1826,89 @@ msgid ""
 "Leave the field empty for default (%a - %t)."
 msgstr ""
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr ""
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr ""
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1878,7 +1916,7 @@ msgid ""
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1886,66 +1924,72 @@ msgid ""
 "%i - temporary input file name</small>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr ""
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr ""
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr ""
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Tilføj"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Kunne ikke finde pixmapfil: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1973,27 +2017,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2002,74 +2046,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2077,90 +2121,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2187,102 +2231,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index e2d7118..2739c30 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,17 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Jan D. Behrens <zykure at web.de>, 2013
-# wander <wander.homer at gmail.com>, 2013
-# wander <wander.homer at gmail.com>, 2013
-# Jan D. Behrens <zykure at web.de>, 2013
+# Zykure <zykure at web.de>, 2013
+# Wander <wander.homer at gmail.com>, 2013
+# Wander <wander.homer at gmail.com>, 2013
+# Zykure <zykure at web.de>, 2013
+# Zykure <zykure at web.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:49+0000\n"
-"Last-Translator: wander <wander.homer at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/de/)\n"
 "Language: de\n"
@@ -22,17 +23,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Über DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s ChangeLog"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF Übersetzer"
@@ -89,795 +90,820 @@ msgstr "Vorverstärkung zurücksetzen"
 msgid "Zero Bands"
 msgstr "Equalizer zurücksetzen"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Voreinstellungen"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 Tag %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d Tage %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Angehalten | %d Titel | %s gesamte Spielzeit"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Pausiert | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d Titel | %s gesamte Spielzeit"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Neue Wiedergabeliste"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Neue Wiedergabeliste (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Wiedergabeliste mit Reitern"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Wiedergabeliste"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "Splitter (oben/unten)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "Splitter (links/rechts)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "Reiter für Wiedergabelisten"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Auswahl-Eigenschaften"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Album Artwork"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "Oszilloskop"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Knopf"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Fehler beim Lesen der Hilfedatei"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Fehler beim Laden der Hilfedatei"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
-"DeaDBeeF führt gerade Aufgaben im Hintergrund durch. Wenn Sie jetzt beenden, "
-"werden diese abgebrochen oder beendet. Dies könnte zu Datenverlust führen."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "Wollen Sie trotzdem beenden?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Datei"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "Dateien ö_ffnen"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Dateien hinzufügen"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Verzeichnisse hinzufügen"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Ort hinzufügen"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Neue Wiedergabeliste"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Wiedergabeliste laden"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Wiedergabeliste speichern"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Löschen"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Alles auswählen"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Alles abwählen"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Auswahl umkehren"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Auswahl"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Abschneiden"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "Suchen"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Sortiere nach"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Titel"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Track-Nummer"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Künstler"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Datum"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Zufällig"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Statusleiste"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "Designmodus"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Wiedergabe"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Reihenfolge"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Linear"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Track-Shuffle"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Album-Shuffle"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Wiederholen"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Wiederhole alles"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Wiederhole einzelnen Track"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "Keine Wiederholung"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Bildlauf folgt Wiedergabe"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Mauszeiger folgt Wiedergabe"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Nach aktuellem Titel anhalten"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Zu aktuellem Titel springen"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_ChangeLog"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Info"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Übersetzer"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Suche"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Abspielen"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Anhalten"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Vorheriges"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Nächstes"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Zufälliges Abspielen"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Info"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Titeleigenschaften"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "Ort:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "A_nwenden"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Neuen Spaltentitel eingeben"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Index"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Wiedergabe"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Album Artwork"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Künstler - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Dauer"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Track-Nummer"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Band / Album-Künstler"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Ausrichtung:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Linksbündig"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Rechtsbündig"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Ausgabeplugin:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Ausgabegerät:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Immer 8-bit Audio nach 16-bit konvertieren"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Immer 16-bit Audio nach 24-bit konvertieren"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Audio"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Replaygain-Modus:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Titel"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Replaygain-Ausschlagschutz"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Replaygain-Vorverstärkung:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Globale Vorverstärkung:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Datein beim Hinzufügen von Kommandozeile (oder Dateimanager) an Liste "
 "anhängen:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Beim Start letzte Sitzung wiederherstellen"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr ""
 "Dateien innerhalb von Archiven beim Hinzufügen von Verzeichnissen auslassen"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "\"Nach aktuellem Titel anhalten\" automatisch zurücksetzen"
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Wiedergabe"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Einstellungen"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP Voreinstellung"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Laden"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Beim Schließen minimieren"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Systemleisten-Icon verstecken"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "Erkennung und Rekodierung von CP1251 (russisch)"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Erkennung und Rekodierung von CP936 (chinesisch)"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Aktualisierungsrate der Benutzeroberfläche (Ereignisse pro Sekunde):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Fenstertitel beim Abspielen:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Fenstertitel wenn angehalten:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "GUI-Plugin (Änderung benötigt Neustart):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr "Player"
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr "Wiedergabeliste mit Mittelklick schließen"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr "Aktuellen Titel hervorheben"
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Eintrag \"Vom Datenträger entfernen\" im Kontextmenü verstecken"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 "Wiedergabeliste beim Hinzufügen einzelner Verzeichnisse automatisch benennen"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr "Spalten automatisch an die Fenstergröße anpassen"
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "GUI/Diverses"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Überschreiben"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Vordergrund"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Hintergrund"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Farben von Suchleiste und Lautstärkeregler"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Mittel"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Hell"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Dunkel"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Basis"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Text"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Farben der Reiterleiste"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Überschreiben (beschleunigt die Darstellung)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Gerade Zeile"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Ungerade Zeile"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Ausgewählte Zeile"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Ausgewählter Text"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Mauszeiger"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Farben der Wiedergabeliste"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Farben"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Proxyserver aktivieren"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Adresse des Proxyservers:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Port des Proxyservers:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Art des Proxyservers:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Benutzername für Proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Passwort für Proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr "Bearbeite Zuordnung von Inhalts-Typen "
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr "Zugeordnete Hotkeys:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr "Aktion:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr "<Nicht gesetzt>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr "Tastenkombination:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "Globaler Hotkey"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -889,122 +915,128 @@ msgstr ""
 "Mit \"Zurücksetzen\" können diese wieder rückgängig\n"
 "gemacht werden."
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr "_Vorgabewerte"
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "Hotkeys"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Version: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Erweiterungen"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "Gruppiere nach ..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "Sortiere nach ..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Format"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Aufsteigend"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Absteigend"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Auswahl des DSP-Plugins"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Erweiterung"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Einstellungen für den Tag-Editor"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Schreibe ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Schreibe ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "APEv2 schreiben"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "ID3v2 entfernen"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "ID3v1 entfernen"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "APEv2 entfernen"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 Version"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (empfohlen)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 Zeichensatz (Vorgabe ist iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Schreibe ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr "Zuordnung von Inhalts-Typen"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1016,91 +1048,100 @@ msgstr ""
 "den Inhaltstyp \"audio/x-mpeg\" haben, und werden von DeaDBeeFs eigener "
 "Erweiterung \"stdmpg\" oder der Erweiterung \"ffmpeg\" dekodiert."
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr "Vorgabewerte"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr "Inhalts-Typ:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "Erweiterungen:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr "Knopf-Einstellungen"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr "Farbe:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr "Textfarbe:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr "Symbol:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr "Titel:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr "Aktion auswählen"
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Künstler / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Track-Nr."
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Zur Warteschlange hinzufügen"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Von Warteschlange entfernen"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Metadaten neu laden"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Vom Datenträger entfernen"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Spalte hinzufügen"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Spalte bearbeiten"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Spalte entfernen"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr "Gruppen beim Scrollen fixieren"
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Gruppieren nach"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Nichts"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Künstler/Datum/Album"
 
@@ -1117,11 +1158,11 @@ msgstr "%s konfigurieren"
 msgid "Default Audio Device"
 msgstr "Standard Ausgabegerät"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr "Änderungen an den Hotkey-Einstellungen wurde nicht gespeichert"
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr "Wollen Sie sicher ohne Speichern fortfahren?"
 
@@ -1129,7 +1170,7 @@ msgstr "Wollen Sie sicher ohne Speichern fortfahren?"
 msgid "Adding files..."
 msgstr "Dateien hinzufügen..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Initialisiere..."
 
@@ -1142,131 +1183,131 @@ msgid "Really close the window?"
 msgstr "Möchten Sie das Fenster wirklich schließen?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Mehrere Werte] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Schlüssel"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Wert"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[Mehrere Werte]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Speichere Tags..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "Feldname"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Name:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Feldnamen dürfen nicht mit : oder _ beginnen"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Kann Feld nicht hinzufügen"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 "Ein Feld mit diesem Namen existiert bereits, bitte einen anderen Name wählen."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Feld hinzufügen"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Feld entfernen"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "Benutzung: deadbeef [Optionen] [--] [Datei(en)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Optionen:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  oder  -h   Hilfe (diese Meldung) anzeigen und beenden\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Player beenden\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Versionsinformationen anzeigen und beenden\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Wiedergabe starten\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Wiedergabe beenden\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Wiedergabe pausieren\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Wiedergabe umschalten (Play/Pause)\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 "   --play-pause       Wiedergabe starten falls angehalten, sonst pausieren\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Nächster Titel in der Wiedergabeliste\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Vorheriger Titel in der Wiedergabeliste\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Zufälliger Titel in der Wiedergabeliste\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr ""
 "   --queue            Datei(en) an bestehende Wiedergabeliste anhängen\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
@@ -1274,13 +1315,13 @@ msgstr ""
 "--gui PLUGIN Gibt an welches GUI-Plugin benutzt werden soll, Standard ist "
 "\"GTK2\"\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 "   --nowplaying FMT   Formatierten Tracknamen auf Standardausgabe schreiben\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1291,7 +1332,7 @@ msgstr ""
 "                      [l]änge, Titel[n]ummer, [y]Jahr, [c]Kommentar,\n"
 "                      copy[r]ight, [e]verstrichen\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1300,28 +1341,24 @@ msgstr ""
 "                      z.B.: --nowplaying \"%%a - %%t\" sollte \"Artist - "
 "Titel\" ausgeben\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"für mehr Informationen siehe http://sourceforge.net/apps/mediawiki/deadbeef/"
-"index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Standard"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Ja"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Nein"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1347,7 +1384,7 @@ msgstr ""
 "Band / Album-Künstler\n"
 "Benutzerdefiniert"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1355,7 +1392,7 @@ msgstr ""
 "Links\n"
 "Rechts"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1365,7 +1402,7 @@ msgstr ""
 "Track\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1373,7 +1410,7 @@ msgstr ""
 "Aufsteigend\n"
 "Absteigend"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1381,14 +1418,7 @@ msgstr ""
 "2.3 (Empfohlen)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Pixmap-Datei nicht gefunden: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1401,8 +1431,8 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "Audio-CD hinzufügen"
+msgid "Add Audio CD"
+msgstr ""
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1694,8 +1724,8 @@ msgstr "Automatische Samplerate (überschreibt die Ziel-Samplerate)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
-msgstr "Benutzerdefinierte Shell-Kommandos"
+msgid "Configure Custom Shell Commands"
+msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
@@ -1712,35 +1742,40 @@ msgstr ""
 msgid "Enable surround"
 msgstr "Aktiviere Surround-Sound"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Die Datei existiert bereits. Überschreiben?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Converter: Warnung"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Bitte einen Encoder auswählen"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Converter: Fehler"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Konvertiere..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Verzeichnis wählen..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Fehler beim Speichern des Encoder-Profil"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1748,79 +1783,79 @@ msgstr ""
 "Bitte Zugriffsrechte auf das Verzeichnis prüfen, einen anderen Titel wählen "
 "oder freien Platz auf der Festplatte schaffen"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 "Ein Profil mit diesem Namen existiert bereits. Bitte einen anderen Titel "
 "wählen."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Fehler"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Neuen Encoder hinzufügen"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Encoder bearbeiten"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Profil entfernen"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Diese Aktion wird das gewählte Profil löschen. Sind Sie sicher?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Encoder"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Plugin in DSP-Kette einfügen"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Fehler beim Speichern des DSP-Profils"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Neues DSP-Profil"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "DSP-Profil bearbeiten"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP-Profile"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Zielverzeichnis:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr "In Verzeichnis der Quelldatei schreiben"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr "Verzeichnisstruktur beibehalten"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Dateiname:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1830,89 +1865,89 @@ msgstr ""
 "Erweiterung (z.B. .mp3) wird automatisch angehängt.\n"
 "Feld leer lassen um Standardwert zu verwenden (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Encoder:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP-Profil:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Thread-Anzahl:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Ausgabe-Sampleformat:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Format der Eingangsdatei verwenden"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 bit signed int"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 bit signed int"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 bit signed int"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 bit signed int"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 bit float"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Falls Datei bereits existiert:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Nachfragen"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Profil laden"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Neuer Encoder"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Endung der Zieldatei:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Z.B. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Kommandozeile:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1922,7 +1957,7 @@ msgstr ""
 "Beispiel: lame - %o\n"
 "%i für Eingabedatei, %o für Zieldatei, - für stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1932,66 +1967,72 @@ msgstr ""
 "<small>%o - Name der Zieldatei\n"
 "%i - Name der temporären Eingabedatei</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Methode:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Pipe"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Temporäre Datei"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Tags schreiben</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "DSP-Profileditor"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Neues DSP-Profil"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Hinzufügen"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Pixmap-Datei nicht gefunden: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2029,27 +2070,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr "Benutzerdefinierte Shell-Kommandos"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "Schließen"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "Kommando bearbeiten"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "Kommando:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2061,17 +2102,17 @@ msgstr ""
 "Anwendung gestartet wurde. Titel-Formatierung kann benutzt werden. Beispiel: "
 "xdg-open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "ID:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr "Beliebiger Name, zum Beispiel \"Mein Shell-Command\""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
@@ -2080,57 +2121,57 @@ msgstr ""
 "Befehls-ID, normalerweise sollte es eine kurze Bezeichnung sein, zum "
 "Beispiel \"youtube_open\". Die Bezeichnung muss eindeutig sein."
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr "Einzelne Tracks"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "Funktioniert mit einzelnem Track."
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "Mehrere Tracks"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "Funktioniert mit mehreren Tracks."
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "Lokale Dateien"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "Funktioniert mit lokalen Dateien."
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr "Entfernte Dateien"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr "Funktioniert mit entfernten Dateien (z.B. http:// Streams)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr "Allgemein (Hauptmenü)"
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "Element soll im Hauptmenü erscheinen"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2141,73 +2182,73 @@ msgstr ""
 "sicher, dass der Titel den Menüpfad in Englisch enthält. Zum Beispiel: "
 "\"File/My Command\"</small>"
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Kommando hinzufügen"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 "Diese Aktion wird das ausgewählte Shell-Kommando löschen. Sind Sie sicher?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr "Bestätige Entfernen"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr "ID darf nicht leer und muss eindeutig sein.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr "Titel darf nicht leer sein.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr "Shell-Kommando darf nicht leer sein.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "Ungültige Werte"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr "Unterstützte Sound-Formate"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "Alle Dateien (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr "Öffne Datei(en)..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr "Datei(en) zu Wiedergabeliste hinzufügen..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr "Ordner zu Wiedergabeliste hinzufügen..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr "Folge symbolischen Links"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "Lösche von Datenträger"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -2215,19 +2256,19 @@ msgstr ""
 "Dateien werden verloren gehen. Fortführen?\n"
 "(Dieser Dialog kann in den Einstellung des GTKUI-Plugins deaktiviert werden)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "Wiedergabeliste laden"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "Andere Dateien (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr "Speichere Wiedergabeliste als"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF playlist files (*.dbpl)"
 
@@ -2261,102 +2302,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr "Nichts ist ausgewählt."
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr "Ersetze mit..."
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr "Einfügen..."
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr "Kopieren"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr "Einfügen"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr "Mehrere Widgets dieser Art werden nicht unterstützt"
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr "Position sperren"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr "Reiter nach links bewegen"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr "Reiter nach rechts bewegen"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr "Reiter entfernen"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr "Reiter umbennen"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr "Neuen Reiter hinzufügen"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr "Zeige Spaltentitel"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr "Erweitere die Box um 1 Element"
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr "Reduziere die Box um 1 Element"
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr "Gleichmäßig"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr "Erweitern"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr "Ausfüllen"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr "Bearbeite Knopf"
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr "Wiedergabeliste editieren"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr "Wiedergabeliste umbenennen"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr "Wiedergabeliste entfernen"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr "Neue Wiedergabeliste"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr "Name"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr "Wiedergabelisten-Browser"
diff --git a/po/el.po b/po/el.po
index 4d55f32..54090b5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/el/)\n"
 "Language: el\n"
@@ -21,17 +21,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Σχετικά με το DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Αλλαγές DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Μεταφραστές του DeaDBeeF"
@@ -88,44 +88,44 @@ msgstr "Μηδενισμός Προενίσχυσης"
 msgid "Zero Bands"
 msgstr "Μηδενισμός Ζωνών"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Προρυθμίσεις"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 μέρα %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d μέρες %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Σταματημένο | %d κομμάτια | %s συνολικός χρόνος αναπαραγωγής"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Μονοφωνικό"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Στερεοφωνικό"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Παύση | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -133,752 +133,776 @@ msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d κομμάτια | %s συνολικός "
 "χρόνος αναπαραγωγής"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Νέα Λίστα Αναπαραγωγής"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Νέα Λίστα Αναπαραγωγής (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Λίστα αναπαραγωγής με καρτέλες"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Λίστα Αναπαραγωγής"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "Καρτέλες λιστών αναπαραγωγής"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Ιδιότητες επιλογής"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Προβολή εξώφυλλων"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Κουμπί"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Αποτυχία κατά την ανάγνωση του αρχείου βοήθειας"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Αποτυχία κατά τη φόρτωση του αρχείου βοήθειας"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
-"Ο αναπαραγωγέας εκτελεί εργασίες στο υπόβαθρο. Αν τερματίσετε τώρα, οι "
-"εργασίες θα ακυρωθούν ή θα διακοπούν. Αυτό μπορεί να καταλήξει σε απώλεια "
-"δεδομένων."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "Θέλετε πραγματικά να τερματίσετε την εφαρμογή;"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Αρχείο"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Άνοιγμα αρχείου(-ων)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Προσθήκη αρχείου(-ων)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Προσθήκη φακέλου(-ων)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Προσθήκη τοποθεσίας"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Νέα λίστα αναπαραγωγής"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Φόρτωση λίστας αναπαραγωγής"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Αποθήκευση λίστας αναπαραγωγής"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Έξοδος"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Καθαρισμός"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Επιλογή όλων"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Αποεπιλογή όλων"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Αναστροφή επιλογής"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Επιλεγμένο"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Περικοπή"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Αναζήτηση"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Ταξινόμηση κατά"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Τίτλος"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Αριθμός κομματιού"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Άλμπουμ"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Καλλιτέχνης"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Ημερομηνία"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Τυχαία"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Αυτοσχέδιο"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Ρυθμίσεις"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Εμφανίση"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Μπάρα κατάστασης"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Ισοσταθμιστής"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "Λειτουργία σχεδίασης"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "Α_ναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Σειρά"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Γραμμικά"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Ανακάτεμα κομματιών"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Ανακάτεμα άλμπουμ"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Επανάληψη"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Επανάληψη όλων"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Επανάληψη ενός τραγουδιού"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "Να μην γίνει επανάληψη"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Η κύλιση ακολουθεί την αναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Ο δείκτης ποντικιού ακολουθεί την αναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Διακοπή μετά το τρέχον"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Μεταπήδηση στο τρέχον κομμάτι"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Αλλαγές"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Σχετικά"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Μεταφραστές"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Διακοπή"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Αναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Παύση"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Επόμενο"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Αναπαραγωγή τυχαίου"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Σχετικά"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Ιδιότητες Κομματιού"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "Τοποθεσία:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Επιλογές"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Εφαρμογή"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Μεταδεδομένα"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Τίτλος:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Εισαγωγή νέου τίτλου για τη στήλη"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Τύπος"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Αριθμός αντικειμένου"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Αναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Σχέδιο άλπουμ"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Καλλιτέχνης - Άλμπουμ"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Διάρκεια"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Αριθμός Κομματιού"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Συγκρότημα / Καλλιτέχνης άλμπουμ"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Μορφή:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Στοίχιση:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Αριστερά"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Δεξιά"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Άκυρο"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_Εντάξει"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Πρόσθετο εξόδου:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Συσκευή εξόδου:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Να γίνεται πάντα μετατροπή του ήχου 8 bit σε 16 bit"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Να γίνεται πάντα μετατροπή του ήχου 16 bit σε 24 bit"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Ήχος"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Λειτουργία Replaygain:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Ανενεργό"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Κομμάτι"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Κορυφή κλίμακας Replaygain"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Προενίσχυση Replaygain:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Καθολική προενίσχυση"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Προσθήκη αρχείων από την γραμμή εντολών (ή το διαχειριστή αρχείων) σε αυτή "
 "τη λίστα αναπαραγωγής:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Συνέχεια προηγούμενης συνεδρίας στην εκκίνηση"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Να μη γίνεται προσθήκη από αρχειοθήκες κατά την προσθήκη φακέλων"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Αναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Ρύθμιση"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Προκαθορισμένες Ρυθμίσεις Αλυσίδας DSP"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Φόρτωση"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Ελαχιστοποίηση στο πλαίσιο συστήματος στο κλείσιμο"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Απόκρυψη εικονιδίου στο πλαίσιο συστήματος"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Ρυθμός ανανέωσης γραφικής διεπαφής (φορές το δευτερόλεπτο):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Τίτλος παραθύρου κατά την αναπαραγωγή:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Τίτος παραθύρου κατά τη διακοπή:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Πρόσθετο γραφικής διεπαφής (αλλαγή απαιτεί επανεκκίνηση):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr "Αναπαραγωγέας"
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr "Κλείσιμο λιστών αναπαραγωγής με το μέσο πλήκτρο του ποντικιού"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Απόκρυψη του μενού \"Διαγραφή από το δίσκο\""
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 "Αυτόματη απόδοση ονόματος στις λίστες αναπαραγωγής όταν φορτώνεται ένας "
 "κατάλογος"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Παράκαμψη"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Προσκήνιο"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Παρασκήνιο"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Χρώματα μπάρας μετατόπισης/ήχου"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Μέση"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Φωτεινό"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Σκοτεινό"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Βάση"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Κείμενο"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Χρώματα στο χώρο καρτελών"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Παράκαμψη (χάνει το θέμα GTK treeview, αλλά επιταχύνει την απόδοση)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Ζυγή σειρά"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Μονή σειρά"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Επιλεγμένη σειρά"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Επιλεγμένο κείμενο"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Δείκτης ποντικιού"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Χρώματα λίστας αναπαραγωγής"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Ενεργοποίηση Proxy Server"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Διεύθυνση Proxy Server:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Πόρτα Proxy Server:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Τύπος Proxy:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Όνομα χρήστη Proxy:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Κωδικός Proxy:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr "Επεξεργασία Τύπων Περιεχομένου"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Δίκτυο"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr "Προσδιορισμένες Συντομεύσεις:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr "Ενέργεια:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr "<Δεν έχει οριστεί>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr "Συνδυασμός πλήκτρων:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "Γενική συντόμευση"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -886,122 +910,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr "_Προκαθορισμένα"
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "Συντομεύσεις"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Έκδοση:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Πνευματικά δικαιώματα"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Πρόσθετα"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "Ομαδοποίηση Κατά ..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "Ταξινόμηση κατά ..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Μορφή"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Αύξουσα σειρά"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Φθίνουσα σειρά"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Επιλέξτε Πρόσθετο DSP"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Πρόσθετο"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Επιλογές Συγγραφέα Ετικετών"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Εγγραφή ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Εγγραφή ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Εγγραφή APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Αφαίρεση ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Αφαίρεση ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Αφαίρεση APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Έκδοση ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Προτείνεται)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 κωδικοποίηση χαρακτήρων (προεπιλογή είναι iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Εγγραφή ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr "Επιλογή Τύπων Περιεχομένου"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1009,91 +1039,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr "Επαναφορά στα προκαθορισμένα"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr "Τύπος περιεχομένου:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "Πρόσθετα:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr "Ιδιότητες κουμπιού"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr "Χρώμα:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr "Χρώμα κειμένου:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr "Εικονίδιο:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr "Ετικέτα:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr "Επιλογή ενέργειας"
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Καλλιτέχνης / Άλμπουμ"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Αρ. Κομματιού"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Προσθήκη στην ουρά αναπαραγωγής"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Αφαίρεση από την ουρά αναπαραγωγής"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Επαναφόρτωση μεταδεδομένων"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Αφαίρεση από τον δίσκο"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Προσθήκη στήλης"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Επεξεργασία στήλης"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Αφαίρεση στήλης"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Ομαδοποίηση κατά"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Καμία"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Καλλιτέχνης/Ημερομηνία/Άλμπουμ"
 
@@ -1110,11 +1149,11 @@ msgstr "Ρύθμιση %s"
 msgid "Default Audio Device"
 msgstr "Προεπιλεγμένη συσκευή ήχου"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1122,7 +1161,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Προσθήκη αρχείων"
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Αρχικοποίηση..."
 
@@ -1135,104 +1174,104 @@ msgid "Really close the window?"
 msgstr "Είστε σίγουροι πως θέλετε να κλείσετε το παράθυρο;"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Πολλαπλές τιμές]"
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Πλήκτρο"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Τιμή"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[Πολλαπλές τιμές]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Εγγραφή ετικετών..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "Όνομα πεδίου"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Τα πεδία ονόματος δεν πρέπει να ξεκινούν με : ή _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Αποτυχία προσθήκης πεδίου"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 "Υπάρχει ήδη πεδίο με αυτό το όνομα, παρακαλώ προσπαθήστε με ένα διαφορετικό "
 "όνομα."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Προσθήκη πεδίου"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Αφαίρεση πεδίου"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "Χρήση: deadbeef [επιλογές] [--] [αρχείο(-α)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Επιλογές:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr " --help ή -h Εμφάνιση κειμένου βοήθειας (αυτό το κείμενο) και έξοδος\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "--quit Έξοδος\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "--version Εμφάνιση πληροφοριών έκδοσης και έξοδος\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "--play Εκκίνηση αναπαραγωγής\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "--stop Διακοπή αναπαραγωγής\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "--pause Παύση αναπαραγωγής\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "--toggle-pause Εναλλαγή παύσης\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1240,27 +1279,27 @@ msgstr ""
 "--play-pause Εκκίνηση αναπαραγωγής αν είναι σταματημένο, αλλιώς εναλλαγή "
 "παύσης\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "--next Επόμενο κομμάτι στη λίστα αναπαραγωγής\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "--prev Προηγούμενο κομμάτι στη λίστα αναπαραγωγής\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "--random Τυχαίο κομμάτι στη λίστα αναπαραγωγής\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "--queue Προσάρτηση αρχείου(-ων) στην υπάρχουσα λίστα αναπαραγωγής\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
@@ -1268,12 +1307,12 @@ msgstr ""
 "--gui PLUGIN  Επιλέγει ποιό πρόσθετο γραφικής διεπαφής θα χρησιμοποιηθεί, το "
 "προκαθορισμένο είναι το \"GTK2\"\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "--nowplaying FMT Εμφάνιση μορφοποιημένου ονόματος κομματιού\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1284,35 +1323,31 @@ msgstr ""
 " [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 " copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr "π.χ.: --nowplaying \"%%a - %%t\" θα εμφανίσει \"artist - title\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"για περισσότερες πληροφορίες, δείτε το http://sourceforge.net/apps/mediawiki/"
-"deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Ναί"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Όχι"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1338,7 +1373,7 @@ msgstr ""
 "Καλλιτέχνης Συγκροτήματος / Άλμπουμ\n"
 "Προσαρμοσμένο"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1346,7 +1381,7 @@ msgstr ""
 "Αριστερα\n"
 "Δεξιά"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1356,7 +1391,7 @@ msgstr ""
 "Κομμάτι\n"
 "Άλμπουμ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1364,7 +1399,7 @@ msgstr ""
 "Αύξουσα σειρά\n"
 "Φθίνουσα σειρά"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1372,14 +1407,7 @@ msgstr ""
 "2.3 (Προτείνεται)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Δε βρέθηκε το αρχείο pixmap: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1392,8 +1420,8 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "Προσθήκη CD μουσικής"
+msgid "Add Audio CD"
+msgstr ""
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1685,8 +1713,8 @@ msgstr "Αυτόματη δειγματοληψία (υπερέχει του σ
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
-msgstr "Ρύθμιση προσαρμοσμένων εντολών κελύφους"
+msgid "Configure Custom Shell Commands"
+msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
@@ -1702,35 +1730,40 @@ msgstr ""
 msgid "Enable surround"
 msgstr "Ενεργοποίηση περιφερειακού ήχου"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Το αρχείο υπάρχει ήδη. Να αντικατασταθεί;"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Προειδοποίηση μετατροπής"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Παρακαλώ επιλέξτε κωδικοποιητή "
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Σφάλμα μετατροπέα"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Μετατροπή..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Επιλογή φακέλου"
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Αποτυχία αποθήκευσης προρύθμισης κωδικοποιητή "
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1738,80 +1771,80 @@ msgstr ""
 "Ελέγξτε τα δικαιώματα του φακέλου προρυθμίσεων, δοκιμάστε με ένα διαφορετικό "
 "όνομα, ή ελευθερώστε χώρο στο σκληρό δίσκο"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 "Υπάρχει ήδη μια προρύθμιση με αυτό το όνομα. Δοκιμάστε να διαλέξετε ένα "
 "διαφορετικό όνομα."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Προσθήκη κωδικοποιητή"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Επεξεργασία κωδικοποιητή"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Αφαίρεση προρύθμισης"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 "Αυτή η ενέργεια θα διαγράψει την επιλεγμένη προρύθμιση. Είστε σίγουροι;"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Κωδικοποιητές"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Προσθήκη πρόσθετου στην αλυσίδα DSP"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Αποτυχία αποθήκευσης προρύθμισης DSP"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Νέα Προρύθμιση DSP"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Επεξεργασία Προρύθμισης DSP"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "Προρυθμίσεις DSP"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Φάκελος εξόδου:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Όνομα αρχείου εξόδου:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1821,89 +1854,89 @@ msgstr ""
 "Η επέκταση (π.χ. .mp3) θα προστεθεί αυτόματα.\n"
 "Αφήστε το πεδίο κενό για την προεπιλογή (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Κωδικοποιητής:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "Ρύθμιση DSP:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Αριθμός νημάτων:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Μορφή δειγματοληψίας εξόδου:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Διατήρηση μορφής εισόδου"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "Προσημασμένος ακέραιος 8 bit"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "Προσημασμένος ακέραιος 16 bit"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "Προσημασμένος ακέραιος 24 bit"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "Προσημασμένος ακέραιος 32 bit"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "Δεκαδικός 32 bit"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Όταν το αρχείο υπάρχει ήδη:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Ερώτηση"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Αντικατάσταση"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Επεξεργασία Ρύθμισης Κωδικοποιητή"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Ανώνυμος Κωδικοποιητής"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Επέκταση αρχείου εξόδου:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Π.χ. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Γραμμή εντολών:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1913,7 +1946,7 @@ msgstr ""
 "Παράδειγμα: lame - %o\n"
 "%i για το αρχείο εισόδου, %o για το αρχείο εξόδου, - για το stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1923,66 +1956,72 @@ msgstr ""
 "<small>%o - όνομα αρχείου εξόδου\n"
 "%i - όνομα προσωρινού αρχείου εισόδου</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Μέθοδος"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Σωλήνωση"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Προσωρινό αρχείο"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Συγγραφέας ετικετών</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "Επεξεργαστής Ρυθμίσεων DSP"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Ανώνυμη Ρύθμιση DSP"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Προσθήκη"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Δε βρέθηκε το αρχείο pixmap: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2010,27 +2049,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr "Προσαρμοσμένες Εντολές Κελύφους"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "Επεξεργασία Εντολής"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "Εντολή:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2039,74 +2078,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "Αναγνωριστικό:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr "Όνομα σε ελεύθερη μορφή, για παράδειγμα \"Η εντολή μου\""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr "Μονά Κομμάτια"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "Δουλεύει σε ένα κομμάτι."
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "Πολλαπλά Κομμάτια"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "Δουλεύει σε πολλαπλά κομμάτια"
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "Τοπική"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "Δουλεύει σε τοπικά αρχεία."
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr "Απομακρυσμένη"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr "Δουλεύει σε απομακρυσμένα αρχεία (π.χ. ροές http://)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2114,91 +2153,91 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Προσθήκη Εντολής"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 "Αυτή η ενέργεια θα διαγράψει την επιλεγμένη εντολή κελύφους. Είστε σίγουροι;"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr "Επιβεβαίωση Αφαίρεσης"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr "Το αναγνωριστικό πρέπει να μην είναι κενό και να είναι μοναδικό.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr "Ο τίτλος πρέπει να μην είναι κενός.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr "Η Εντολή Κελύφους πρέπει να μην είναι κενή.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "Μη Έγκυρες Τιμές."
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "Όλα τα αρχεία (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr "Άνοιγμα αρχείου(-ων)..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr "Προσθήκη αρχείου(-ων) στη λίστα αναπαραγωγής..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr "Προσθήκη φακέλου(-ων) στη λίστα αναπαραγωγής..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr "Ακολούθηση συμβολικών συνδέσμων"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "Διαγραφή αρχείων από τον δίσκο"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "Φόρτωση Λίστας Αναπαραγωγής"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "Άλλα αρχεία (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr "Αποθήκευση Λίστας Αναπαραγωγής Ως"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Αρχεία λιστών αναπαραγωγής DeaDBeeF EQ (*.dbpl)"
 
@@ -2225,102 +2264,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr "Δεν έχει επιλεχτεί τίποτα."
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr "Αντικατάσταση με..."
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr "Εισαγωγή..."
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr "Κλείδωμα κίνησης"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr "Μετακίνηση καρτέλας αριστερά"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr "Μετακίνηση καρτέλας δεξιά"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr "Αφαίρεση καρτέλας"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr "Μετονομασία καρτέλας"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr "Προσθήκη νέας καρτέλας"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr "Εμφάνιση Κεφαλίδων Στηλών"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr "Ανάπτυξη κουτιού κατά 1 αντικείμενο"
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr "Ομογενής"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr "Ανάπτυξη"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr "Γέμιση"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr "Ρύθμιση κουμπιού"
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr "Επεξεργασία λίστας αναπαραγωγής"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr "Μετονομασία Λίστας Αναπαραγωγής"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr "Αφαίρεση Λίστας Αναπαραγωγής"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr "Προσθήκη Νέας Λίστας Αναπαραγωγής"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index eee415d..3a1b605 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:49+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "deadbeef-player/language/en_GB/)\n"
 "Language: en_GB\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "About DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s ChangeLog"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF Translators"
@@ -85,789 +85,816 @@ msgstr "Zero Preamp"
 msgid "Zero Bands"
 msgstr "Zero Bands"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Presets"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 day %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d days %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Stopped | %d tracks | %s total playtime"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Paused | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "New Playlist"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "New Playlist (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Failed while reading help file"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Failed to load help file"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Warning"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_File"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Open file(s)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Add file(s)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Add folder(s)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Add location"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "New playlist"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Load playlist"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Save playlist"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Clear"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Select all"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Deselect all"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Invert selection"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Selection"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Remove"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Crop"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Find"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Title"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Track number"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Artist"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Date"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Random"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Custom"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_View"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Status bar"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Equaliser"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Playback"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Order"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Linear"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Shuffle tracks"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Shuffle albums"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Looping"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Scroll follows playback"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Cursor follows playback"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Stop after current"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Jump to current track"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Help"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_ChangeLog"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_About"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Translators"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Search"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Stop"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Play"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pause"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Previous"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Next"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Play Random"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "About"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Quit"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Help"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Track Properties"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Settings"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Apply"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Close"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Properties"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Title:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Enter new column title here"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Type:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Item Index"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Playing"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Album Art"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Artist - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Duration"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Track Number"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Band / Album Artist"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Alignment:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Left"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Right"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Output plugin:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Output device:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Always convert 8 bit audio to 16 bit"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Sound"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Replay-gain mode:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Disable"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Track"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Replay-gain peak scale"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Replay-gain preamp:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Global preamp:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "Add files from command line (or file manager) to this playlist:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Resume previous session on startup"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Don't add from archives when adding folders"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "_Playback"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Configure"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP Chain Preset"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Load"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Close minimises to tray"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Hide system tray icon"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Interface refresh rate (times per second):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Titlebar text while playing:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Titlebar text while stopped:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "GUI Plugin (changing requires restart):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Hide \"Delete from disk\" in context menu"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Auto-name playlists when adding a single folder"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Override"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Foreground"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Background"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Seek-bar/Volume-bar colours"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Middle"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Light"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Dark"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Text"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Tab strip colours"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Override (loses GTK tree-view theming, but speeds up rendering)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Even row"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Odd row"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Selected row"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Selected text"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Cursor"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Playlist colours"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Colours"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Enable Proxy Server"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Proxy Server Address:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Proxy Server Port:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Proxy Type:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Proxy User-name:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Proxy Password:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Network"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -875,122 +902,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Version: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Format"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Ascending"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Descending"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Select DSP Plugin"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Tag Writer Settings"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Write ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Write ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Write APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Strip ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Strip ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Strip APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 version"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Recommended)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 character encoding (default is iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Write ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -998,91 +1031,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Artist / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Track No."
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Add to playback queue"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Remove from playback queue"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Reload metadata"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Remove from disk"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Add column"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Edit column"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Remove column"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Group by"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "None"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Artist/Date/Album"
 
@@ -1099,11 +1141,11 @@ msgstr "Configure %s"
 msgid "Default Audio Device"
 msgstr "Default Audio Device"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1111,7 +1153,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Adding files..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Initialising..."
 
@@ -1124,140 +1166,140 @@ msgid "Really close the window?"
 msgstr "Really close the window?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Multiple values] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Key short-cuts"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Value"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Writing tags..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Name:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Field names must not start with : or _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Cannot add field"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Field with such name already exists, please try different name."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Add field"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Remove field"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Options:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  or  -h     Print help (this message) and exit\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Quit player\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Print version info and exit\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Start playback\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Stop playback\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Pause playback\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Toggle pause\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Next song in playlist\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Previous song in playlist\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Random song in playlist\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Append file(s) to existing playlist\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Print formatted track name to stdout\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1268,7 +1310,7 @@ msgstr ""
 "                      [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 "                      copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1277,28 +1319,24 @@ msgstr ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Default"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Yes"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "No"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1316,7 +1354,7 @@ msgstr ""
 "PlayingAlbum ArtArtist - AlbumArtistAlbumTitleDurationTrack NumberBand / "
 "Album ArtistCustom"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1324,7 +1362,7 @@ msgstr ""
 "Left\n"
 "Right"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1334,7 +1372,7 @@ msgstr ""
 "Track\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1342,7 +1380,7 @@ msgstr ""
 "Ascending\n"
 "Descending"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1350,14 +1388,7 @@ msgstr ""
 "2.3 (Recommended)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Couldn’t find pixmap file: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1369,7 +1400,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1662,7 +1693,7 @@ msgstr "Automatic sample rate (overrides Target sample rate)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1679,35 +1710,40 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "The file already exists. Overwrite?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Converter warning"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Please select encoder"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Converter error"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Converting..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Select folder..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Failed to save encoder preset"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1715,77 +1751,77 @@ msgstr ""
 "Check preset folder permissions, try to pick a different title, or free up "
 "some disk space"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "Preset with the same name already exists. Pick another title."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Error"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Add new encoder"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Edit encoder"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Remove preset"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "This action will delete the selected preset. Are you sure?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Encoders"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Add plugin to DSP chain"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Failed to save DSP preset"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "New DSP Preset"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Edit DSP Preset"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP Presets"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Output folder:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Output file name:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1795,89 +1831,89 @@ msgstr ""
 "File extension (e.g. .mp3) will be appended automatically.\n"
 "Leave the field empty for the default (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Encoder:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP preset:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Number of threads:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Output sample format:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Keep source format"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 bit signed integer"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 bit signed integer"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 bit signed integer"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 bit signed integer"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 bit float"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "When file exists:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Prompt"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Overwrite"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Edit Encoder Preset"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Untitled Encoder"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Output file extension:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "E.g. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Command line:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1887,7 +1923,7 @@ msgstr ""
 "Example: lame - %o\n"
 "%i for input file, %o for output file, - for stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1897,66 +1933,72 @@ msgstr ""
 "<small>%o - output file name\n"
 "%i - temporary input file name</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Method:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Pipe"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Temporary file"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Tag writer</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "DSP Preset Editor"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Untitled DSP Preset"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Add"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Couldn’t find pixmap file: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1984,27 +2026,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2013,74 +2055,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2088,90 +2130,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2198,102 +2240,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 55668bb..2463327 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,18 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Adolfo Jayme Barrientos <fitoschido at ubuntu.com>, 2013
+# Adolfo Jayme Barrientos <fitoschido at ubuntu.com>, 2013
+# Adolfo Jayme Barrientos <fitoschido at ubuntu.com>, 2013
+# Carlos, 2013-2014
+# Charlesles, 2013
 # depaz <depazzz at gmail.com>, 2010
 # Hugo Florentino <sysadmin at cips.cu>, 2010
-# legion1978 <legion1978 at gmail.com>, 2013
-# legion1978 <legion1978 at gmail.com>, 2013
+# Roony Alvarez <legion1978 at gmail.com>, 2013
+# Roony Alvarez <legion1978 at gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/es/)\n"
 "Language: es\n"
@@ -23,17 +26,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Acerca de DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Cambios en DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Traductores de DeaDBeeF"
@@ -48,7 +51,7 @@ msgstr "Ajustes del EQ de DeaDBeeF (*.ddbeq)"
 
 #: ../plugins/gtkui/eq.c:187
 msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Cargar Ajustes del EQ de DeaDBeef..."
+msgstr "Cargar ajustes del EQ de DeaDBeeF…"
 
 #: ../plugins/gtkui/eq.c:191
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
@@ -56,7 +59,7 @@ msgstr "Ajustes del EQ de DeaDBeeF (*.ddbeq)"
 
 #: ../plugins/gtkui/eq.c:252
 msgid "Import Foobar2000 EQ Preset..."
-msgstr "Importar Ajustes del EQ de Foobar2000..."
+msgstr "Importar ajustes del EQ de Foobar2000…"
 
 #: ../plugins/gtkui/eq.c:256
 msgid "Foobar2000 EQ presets (*.feq)"
@@ -90,917 +93,951 @@ msgstr "Restablecer preamp"
 msgid "Zero Bands"
 msgstr "Restablecer bandas"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Preajustes"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 día y %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d días y %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Detenido | %d pistas | Tiempo total: %s"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
-msgstr "Mono"
+msgstr "Monoaural"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgstr "| %4d kb/s "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Pausado | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d pistas | Tiempo total: %s"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
-msgstr "Nueva lista de reproducción"
+msgstr "Lista de reproducción nueva"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
-msgstr "Nueva lista de reproducción (%d)"
+msgstr "Lista de reproducción nueva (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Lista de reproducción con pestañas"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Lista de reproducción"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
-msgstr "Divisor (Superior e inferior)"
+msgstr "Divisor (superior e inferior)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
-msgstr "Divisor (Izquierdo y derecho)"
+msgstr "Divisor (izquierdo y derecho)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "Pestañas de lista de reproducción"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Propiedades de selección"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Mostrar portada"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "Alcance"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr "Hbox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr "Vbox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Botón"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Error al leer el archivo de ayuda"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Error al cargar el archivo de ayuda"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
-"El reproductor está actualmente ejecutando tareas en trasfondo. Si sale "
-"ahora, las tareas serán canceladas o interrumpidas. Esto puede ocasionar "
-"pérdida de datos."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "¿Está seguro de que quiere salir?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Abrir archivo(s)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Añadir archivo(s)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Añadir carpeta(s)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Añadir dirección"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Nueva lista de reproducción"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Cargar lista de reproducción"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Guardar lista de reproducción"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Limpiar"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Seleccionar todo"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Deseleccionar todo"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Invertir selección"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Selección"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Quitar"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Recortar"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Buscar"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Ordenar por"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Título"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "N.º de la pista"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Álbum"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Artista"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Fecha"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Aleatorio"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Ver"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Barra de estado"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Ecualizador"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "Modo de diseño"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Reproducción"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Orden"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Lineal"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Barajar pistas"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Barajar álbumes"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Repetir"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Repetir todo"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Repetir una sola canción"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "No repetir"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Desplazar al cambiar de pista"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Seleccionar al cambiar de pista"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Detener al terminar la pista actual"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Saltar a la pista actual"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
-msgstr "_Ayuda"
+msgstr "Ay_uda"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Cambios"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Traductores"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Buscar"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Detener"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Aleatorio"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Acerca de"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Salir"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Propiedades de la pista"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "Ubicación:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Configuración"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Título:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Escriba el título de la columna"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Índice del elemento"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Reproduciendo"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Carátula"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Artista - Álbum"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Duración"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "N.º de la pista"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Banda / Artista"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Alineación:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Izquierda"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Derecha"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Complemento de salida:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Dispositivo de salida:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Siempre convertir audio de 8 bits a 16 bits"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Siempre convertir el sonido de 16 bits a 24 bits"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Sonido"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Modo replaygain:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Pista"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Normalizar con replaygain"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Preamplificación replaygain:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Preamplificación global:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Agregar archivos desde la línea de comandos (o gestor de archivos) a la "
 "lista de reproducción:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Reanudar la sesión anterior al inicio"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Al añadir carpetas, no añadir de archivos comprimidos"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "Auto-resetear \"Detener al terminar la pista actual\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Reproducción"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Configurar"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Preajuste de la cadena DSP"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Cargar"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Cerrar minimiza a la bandeja"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Esconder icono de la bandeja del sistema"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "Activar la detección y grabación de Ruso CP1251"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Activar la detección y grabación de Chino CP936"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Tasa de refresco de la interfaz (veces por segundo):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Texto a mostrar en la barra de título mientras se reproduce:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Texto a mostrar en la barra de título mientras no se reproduce:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Complemento de interfaz gráfica (cambiarlo requiere reiniciar):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
-msgstr ""
+msgstr "Reproductor"
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Cerrar listas de reproducción con botón central del ratón"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
-msgstr ""
+msgstr "Resaltar en negritas la pista en reproducción"
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Esconder \"Borrar del disco\" del menú contextual"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Autonombrar listas de reproducción al añadir una carpeta"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "Ajustar automáticamente las columnas a la ventana"
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "Interfaz y más"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Anular"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Frente"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Fondo"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Colores de barras de tiempo/volumen"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Medio"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Claro"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Oscuro"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Texto"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Colores de pestañas"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Cambiar (ignora el tema GTK, pero acelera el renderizado)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Fila par"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Fila impar"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Fila seleccionada"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Texto seleccionado"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Cursor"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Colores de lista de reproducción"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Colores"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Activar el servidor proxy"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Dirección:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Puerto:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Tipo:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Usuario:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Contraseña:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
-msgstr "HTTP User Agent (identificarse como):"
+msgstr "Agente de usuario HTTP:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
-msgstr "Editar mapeo de Content-type"
+msgstr "Editar asignación de tipo de contenido"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Red"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr "Teclas asignadas:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr "Acción:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr "<Sin asignar>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr "Combinación de teclas:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "Tecla global"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
 msgstr ""
+"Para guardar los cambios pulse en Aplicar,\n"
+"o para deshacerlos pulse en Revertir.\n"
+"NO se guardarán los cambios\n"
+"si no pulsa en Aplicar."
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
-msgstr ""
+msgstr "_Predeterminados"
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "Atajos de teclado"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Versión:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "Agrupar por…"
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "Ordenar por…"
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Formato"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Descendente"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Seleccione el complemento DSP"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Complemento"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Preferencias del editor de etiquetas"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Escribir ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Escribir ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Escribir APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Recortar ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Recortar ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Recortar APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Versión de ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (recomendada)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Codificación de ID3v1 (la predet. es iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Escribir ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr "Mapeo de tipo de contenido"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1012,91 +1049,100 @@ msgstr ""
 "del tipo  \"audio/x-mpeg\", y necesitar ser decodificados por el propio "
 "plugin \"stdmpg\" de DeaDBeeF o por el plugin \"ffmpeg\"."
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr "Restablecer los valores predeterminados"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr "Tipo de contenido:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "Complementos:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr "Propiedades del botón:"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr "Color:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr "Color del texto:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr "Icono:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr "Etiqueta:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr "Seleccione una acción"
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Artista / Álbum"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Pista n.º"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Añadir a cola de reproducción"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Quitar de cola de reproducción"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Recargar los metadatos"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Eliminar del disco"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Añadir una columna"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Editar la columna"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Quitar la columna"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
-msgstr ""
+msgstr "Mantener grupos al desplazarse"
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Agrupar por"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Nada"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Artista/Fecha/Álbum"
 
@@ -1113,19 +1159,20 @@ msgstr "Configurar %s"
 msgid "Default Audio Device"
 msgstr "Dispositivo de sonido predeterminado"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
+"Modificó la configuración de atajos de teclado, pero no guardó los cambios."
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
-msgstr ""
+msgstr "¿Quiere continuar sin guardar?"
 
 #: ../plugins/gtkui/progress.c:56
 msgid "Adding files..."
 msgstr "Añadiendo archivos…"
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Inicializando…"
 
@@ -1138,102 +1185,102 @@ msgid "Really close the window?"
 msgstr "¿Realmente quiere cerrar la ventana?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Valores múltiples]"
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Clave"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Valor"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[Valores múltiples]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Escribiendo las etiquetas…"
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "Nombre del campo"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Los nombres de campos no deben comenzar con : o _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "No se puede añadir el campo"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Ya existe un campo con ese nombre, por favor utilice otro diferente."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Añadir campo"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Quitar campo"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "Uso: deadbeef [opciones] [--] [archivo(s)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Opciones:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  o  -h     Mostrar la ayuda (este mensaje) y salir\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Salir del reproductor\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Mostar la versión y salir\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Iniciar reproducción\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Parar reproducción\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Pausar reproducción\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Alternar pausa\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1241,40 +1288,40 @@ msgstr ""
 "   --play-pause       Iniciar la reproducción si está detenida, pausar en "
 "caso contrario\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Siguiente pista de la lista de reproducción\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Pista anterior de la lista de reproducción \n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Canción aleatoria de la lista de reproducción\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Añadir archivo(s) a la lista de reproducción\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr "--gui PLUGIN Dice cual plugin de IGU usar, \"GTK2\" por defecto\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 "   --nowplaying FMT   Mostrar nombre de la pista formateado a través de "
 "stdout\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1285,7 +1332,7 @@ msgstr ""
 "                      l: Duración, n: Pista, y: Año, c: Comentario,\n"
 "                      r: Copyright, e: Tiempo restante\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1294,28 +1341,24 @@ msgstr ""
 "                      ej.: --nowplaying \"%%a - %%t\" mostraría \"artista - "
 "título\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      para más información, vea http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Sí"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "No"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1341,7 +1384,7 @@ msgstr ""
 "Banda / Artista del álbum\n"
 "Personalizado"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1349,7 +1392,7 @@ msgstr ""
 "Izquierda\n"
 "Derecha"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1359,7 +1402,7 @@ msgstr ""
 "\\Pista\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1367,7 +1410,7 @@ msgstr ""
 "Ascendente\n"
 "Descendente"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1375,14 +1418,7 @@ msgstr ""
 "2.3 (recomendada)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Imposible encontrar el archivo pixmap: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1395,8 +1431,8 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "Añadir un CD de sonido"
+msgid "Add Audio CD"
+msgstr ""
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1442,7 +1478,7 @@ msgstr "URL de Scrobble"
 
 #: ../translation/extra.c:16
 msgid "Prefer Album Artist over Artist field"
-msgstr "Preferir Artista del Álbum sobre campo de Artista"
+msgstr "Preferir campo «Artista del álbum» sobre «Artista»"
 
 #. OSS output plugin
 #: ../translation/extra.c:18
@@ -1514,7 +1550,7 @@ msgstr "calidad de remuestreo (0..2, superior es mejor)"
 
 #: ../translation/extra.c:37
 msgid "8-bit output (default is 16)"
-msgstr "Salida de 8-bits (Por defecto es 16)"
+msgstr "Salida de 8 bits (predeterminada: 16)"
 
 #. Game_Music_Emu decoder plugin
 #: ../translation/extra.c:39
@@ -1690,8 +1726,8 @@ msgstr "Muestreo automático (anula la tasa de muestreo de destino)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
-msgstr "Configurar órdenes del usuario"
+msgid "Configure Custom Shell Commands"
+msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
@@ -1701,41 +1737,46 @@ msgstr "Desactivar la reproducción sin pausas (análisis más rápido)"
 #. adplug
 #: ../translation/extra.c:101
 msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr "Preferir emulador Ken sobre Satoh (El surround no funcionará)"
+msgstr "Preferir emulador Ken sobre Satoh (el sonido envolvente no funcionará)"
 
 #: ../translation/extra.c:102
 msgid "Enable surround"
 msgstr "Activar el sonido envolvente"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "El archivo ya existe. ¿Sobreescribir?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Alerta del convertidor"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Por favor, seleccione el codificador"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Error del convertidor"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Convirtiendo…"
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Seleccionar carpeta..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Fallo al guardar preajuste del codificador"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1743,78 +1784,78 @@ msgstr ""
 "Verifique los permisos de la carpeta de preajustes, intente escoger otro "
 "título, o libere algo de espacio en disco"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 "Ya existe un preajuste con el mismo nombre. Intente escoger otro título."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Error"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Añadir nuevo codificador"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Modificar codificador"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Quitar preajuste"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Esta acción eliminará el preajuste seleccionado. ¿Está seguro?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Codificadores"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Añadir complemento a la cadena DSP"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Fallo al guardar preajuste DSP"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Nuevo preajuste DSP"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Modificar preajuste DSP"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "Preajustes DSP"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Carpeta de salida:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr "Escribir a la carpeta fuente de la pista"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
-msgstr "Preservar la estructura de carpetas"
+msgstr "Conservar estructura de las carpetas"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Nombre del archivo de salida:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1824,89 +1865,89 @@ msgstr ""
 "La extensión (p.ej. .mp3) se agregará automáticamente.\n"
 "Deje el campo vacío para el valor predeterminado (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Codificador:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "Preajuste DSP:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Número de hilos:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Formato de muestra de salida:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Mantener el formato de origen"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "entero 8 bit con signo"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "entero 16 bit con signo"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "entero 24 bit con signo"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "entero 32 bit con signo"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "flotante 32 bit"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Cuando el archivo exista:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Preguntar"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Modificar preajuste del codificador"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Codificador sin nombre"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Extensión del archivo de salida:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "P. ej. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Línea de órdenes:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1916,7 +1957,7 @@ msgstr ""
 "Ejemplo: lame - %o\n"
 "%i para el archivo de entrada, %o para el archivo de salida, - para stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1926,66 +1967,72 @@ msgstr ""
 "<small>%o - nombre del archivo de salida\n"
 "%i - nombre del archivo de entrada temporal</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Método:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Tubería"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Archivo temporal"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Editor de etiquetas</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "Editor de preajustes DSP"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Preajuste DSP sin nombre"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Añadir"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Imposible encontrar el archivo pixmap: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1995,12 +2042,12 @@ msgid ""
 "32 bit signed int\n"
 "32 bit float"
 msgstr ""
-"Mantener el formato fuente\n"
-"8 bit signed int\n"
-"16 bit signed int\n"
-"24 bit signed int\n"
-"32 bit signed int\n"
-"32 bit float"
+"Mantener el formato original\n"
+"Entero firmado de 8 bits\n"
+"Entero firmado de 16 bits\n"
+"Entero firmado de 24 bits\n"
+"Entero firmado de 32 bits\n"
+"Flotante de 32 bits"
 
 #: ../plugins/converter/converter.glade.h:19
 msgid ""
@@ -2008,7 +2055,7 @@ msgid ""
 "Overwrite"
 msgstr ""
 "Preguntar\n"
-"Sobre escribir"
+"Sobreescribir"
 
 #: ../plugins/converter/converter.glade.h:34
 msgid ""
@@ -2023,27 +2070,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr "Órdenes personalizadas"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "Editar"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "Editar la orden"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "Orden:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2051,153 +2098,154 @@ msgid ""
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
 msgstr ""
-"Cualquier comando shell. Será ejecutado en el contexto en el cual la "
-"aplicación principal fue iniciada. El formato de título puede usarse. "
-"Ejemplo: xdg-open %D"
+"Cualquier orden de consola. Se ejecutará en el contexto que inició la "
+"aplicación. Puede usarse formato de título. Ejemplo: xdg-open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
-msgstr "ID:"
+msgstr "Id.:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
-msgstr "Nombre libre, por ejemplo \"Mi comando shell\""
+msgstr "Nombre libre, por ejemplo «Mi orden de consola»"
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
-"La ID de comando, normalmente debe ser corta, por ejemplo \"youtube_open\". "
-"Debe ser única."
+"El identificador de la orden: debe ser corto y único, p.ej., «youtube_abrir»."
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
-msgstr "Pistas Sencillas"
+msgstr "Pistas individuales"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "Funciona en pista individual"
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "Múltiples pistas"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "Funciona en múltiples pistas"
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "Locales"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "Funciona en archivos locales"
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
-msgstr "Remoto"
+msgstr "Remotos"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
-msgstr "Funciona en archivos remotos (p.e. http:// streams)"
+msgstr "Funciona en archivos remotos (p.ej., transmisiones http://)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "Genérico (menú principal)"
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "El elemento debe aparecer en el menú principal"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version.</small>"
 msgstr ""
+"<small>Si desea añadir la orden al menú principal, asegúrese que el título "
+"incluya la ruta al menú de la siguiente forma: \"File/Mi orden\", donde File "
+"es el nombre del menú en la versión inglesa.</small>"
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Añadir orden"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr "Esta acción eliminará el comando seleccionado. ¿Está seguro?"
+msgstr "Esta acción eliminará la orden de consola seleccionada. ¿Está seguro?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
-msgstr "Confirmar borrado"
+msgstr "Confirmar eliminación"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr "El id. es obligatorio y debe ser único.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr "El título es obligatorio.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr "Debe proporcionar la orden del intérprete.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "Valores no válidos"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr "Formatos de sonido admitidos"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "Todos los archivos (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
-msgstr "Abrir archivos (*)"
+msgstr "Abrir archivo(s)…"
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
-msgstr "Agregar archivo(s) a la lista de reproducción..."
+msgstr "Añadir archivo(s) a la lista…"
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
-msgstr "Agregar carpeta(s) a la lista de reproducción..."
+msgstr "Añadir carpeta(s) a la lista…"
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr "Seguir enlaces simbólicos"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "Eliminar los archivos del disco"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -2205,19 +2253,19 @@ msgstr ""
 "Los archivos se perderán. ¿Continuar?\n"
 "(Este diálogo puede desactivarse en las preferencias del plugin GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "Cargar lista de reproducción"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "Otros archivos (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr "Guardar lista de reproducción como"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Archivos de DeaDBeeF (*.dbpl)"
 
@@ -2251,102 +2299,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr "No se ha seleccionado nada."
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr "Reemplazar con…"
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr "Insertar…"
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr "Cortar"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr "Pegar"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
-msgstr ""
+msgstr "No se admiten múltiples widgets de este tipo"
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr "Bloquear el movimiento"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr "Mover la pestaña a la izquierda"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr "Mover la pestaña a la derecha"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr "Eliminar la pestaña"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr "Renombrar la pestaña"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr "Añadir una pestaña nueva"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr "Mostrar los títulos de las columnas"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr "Expandir el cuadro un elemento"
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr "Reducir el cuadro un elemento"
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr "Homogéneo"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr "Expandir"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr "Rellenar"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr "Configurar el botón"
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
-msgstr ""
+msgstr "Editar lista de reproducción"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
-msgstr ""
+msgstr "Renombrar lista de reproducción"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
-msgstr ""
+msgstr "Eliminar lista de reproducción"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
-msgstr ""
+msgstr "Añadir lista de reproducción nueva"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
-msgstr ""
+msgstr "Navegador de listas de reproducción"
diff --git a/po/et.po b/po/et.po
index bc2bdf6..57c8165 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/et/)\n"
 "Language: et\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "DeaDBeeF %s teave"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s muudatuste logi"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF tõlkijad"
@@ -85,789 +85,816 @@ msgstr "Nulli eelvõimendus"
 msgid "Zero Bands"
 msgstr "Nulli ribad"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Eelhäälestused"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 päev %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d päeva %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Peatatud | %d lugu | %s kokku mängitud"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Paus | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d lugu | %s kokku mängitud"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Uus esitusloend"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Uus esitusloend (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Abifaili lugemine ebaõnnestus"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Abifaili laadimine ebaõnnestus"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Fail"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Ava fail(e)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Lisa fail(e)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Lisa kaust(ad)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Lisa asukoht"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Uus esitusloend"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Lae esitusloend"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Salvesta esitusloend"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Välju"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Redigeerimine"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Puhasta"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Vali kõik"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Tühista kõik"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Pööra valik"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Valik"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Eemalda"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Kärbi"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Otsi"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Tiitel"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Loo number"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Artist"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Aeg"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Juhuslik"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Muu"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Eelistused"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Vaade"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Olekuriba"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Ekvalaiser"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Taasesitus"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Järjestus"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Järjest"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Lugude juhuesitus"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Albumite juhuesitus"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Kordamine"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Kerimisriba järgib taasesitust"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Kursor järgib taasesitust"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Peata pärast praegust"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Hüppa praeguse loo juurde"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Abi"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Muudatuste logi"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Teave"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Tõlkijad"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Otsi"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Seiska"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Esita"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Peata"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Eelmine"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Järgmine"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Mängi juhuslikult"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Teave"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Välju"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Abi"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Loo omadused"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Seaded"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Rakenda"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Sulge"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metaandmed"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Omadused"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Tiitel:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Sisesta siia uue veeru pealkiri"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Tüüp:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Register"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Mängib"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Albumikujundus"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Esitaja - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Kestvus"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Loo number"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Bänd / Albumi esitaja"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Formaat:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Paigutus:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Vasakul"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Paremal"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Tühista"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Väljund plugin:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Väljund seade:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Alati teisendada 8 bitine heli 16 bitiseks"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Heli"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Helitugevuse parandus:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Keela"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Lugu"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Helitugevuse paranduse piigi väärtus"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Taasesituse eelvõimendus:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Globaalne eelvõimendus:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "Lisa faile käsurealt (või failihaldurist) sellese esitusloendisse:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Jätka käivitamisel eelmist seanssi"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Ära lisa kaustade lisamisel arhiivide sisu"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Taasesitus"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Seadistamine"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP eelseadistus"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Lae"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Sulgemine minimeerib akna"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Süsteemisalve ikooni peitmine"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Kasutajaliidese värskendussagedus (korda sekundis):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Tiitelriba tekst esitamise ajal:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Tiitelriba tekst peatamise ajal:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Graafiline plugin (muutus nõuab taaskäivitust):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Peida menüüst kirje \"Kustuta kettalt\""
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Esitusloendi automaatne nimetamine üksiku kausta lisamisel"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Eira parameetreid"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Esiplaan"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Taust"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Heli- ja esitlusliuguri värvid"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Keskel"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Hele"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Tume"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Alus"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Tekst"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Tabeli värv"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Tühista (kaotab GTK puuvaate teema, kuid kiirendab renderdamist)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Paaris rida"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Paaritu rida"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Valitud rida"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Valitud tekst"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Kursor"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Esitusloendi värvid"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Värvid"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Puhverserveri lubamine"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Puhverserveri aadress:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Puhverserveri port:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Puhverserveri tüüp:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Puhverserveri kasutajanimi:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Puhverserveri parool:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Võrk"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -875,122 +902,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Versioon: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Autoriõigused"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Pluginad"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Formaat"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Kasvav"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Kahanev"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Vali DSP plugin"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Sildikirjutaja seaded"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Kirjuta ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Kirjuta ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Kirjuta APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "ID3v2 eemaldamine"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "ID3v1 eemaldamine"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "APEv2 eemaldamine"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 versioon"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Soovitatav)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 märgikodeering (vaikimisi iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Kirjuta ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -998,91 +1031,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Esitaja / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Loo number"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Lisa esitusnimekirja"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Eemalda esitusnimekirjast"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Uuestilae metaandmed"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Eemalda kettalt"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Lisa veerg"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Muuda veergu"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Eemalda veerg"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Rühmitamise alus"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Mitte ükski"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Esitaja/Aeg/Album"
 
@@ -1099,11 +1141,11 @@ msgstr "Konfigureeri %s"
 msgid "Default Audio Device"
 msgstr "Vaikimisi audioseade"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1111,7 +1153,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Failide lisamine..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Algväärtustamine..."
 
@@ -1124,102 +1166,102 @@ msgid "Really close the window?"
 msgstr "Kas soovid akna sulgeda?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Mitu väärtust] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Võti"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Väärtus"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Siltide kirjutamine..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Väljanimi ei tohi alata sümboliga : või _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Ei õnnestu välja lisada"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Sellise nimega väli on juba olemas, proovi teist ​​nime."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Lisa väli"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Eemalda väli"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Valikud:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  või  -h     Prindib abi (praeguse sõnumi) ja väljub\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Mängijast väljumine\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Väljastab versiooniteabe ja väljub\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Alustab taasesitlust\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Peatab taasesitluse\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Taasesituse paus\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Pausi lülitamine\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1227,38 +1269,38 @@ msgstr ""
 "   --play-pause       Kui peatatud siis alustab taasesitlust, muidu lülitab "
 "pausi ümber\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Järgmine lugu esitlusloendist\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Eelmine lugu esitlusloendist\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Juhuslik lugu esitlusloendist\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Lisab faili(e) esitlusloendisse\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Prindib loo andmed etteantud formaadis\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1269,7 +1311,7 @@ msgstr ""
 "                      [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 "                      copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1278,28 +1320,24 @@ msgstr ""
 "                      näide.: --nowplaying \"%%a - %%t\" peaks väljastama "
 "\"artist - loo nimi\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      lisainfot leiab lehelt http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Jah"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Ei"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1325,7 +1363,7 @@ msgstr ""
 "Bänd / Albumi Artist\n"
 "Muu"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1333,7 +1371,7 @@ msgstr ""
 "Vasak\n"
 "Parem"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1343,7 +1381,7 @@ msgstr ""
 "Lugu\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1351,7 +1389,7 @@ msgstr ""
 "Kasvav\n"
 "Kahanev"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1359,14 +1397,7 @@ msgstr ""
 "2.3 (Soovitatav)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Ei leitud pixmap faili: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1378,7 +1409,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1672,7 +1703,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1689,35 +1720,40 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Fail on juba olemas. Kas kirjutada see üle?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Konverteri hoiatus"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Palun vali kodeerija"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Konverteerimise viga"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Konvertimine..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Kausta valimine..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Kodeerija eelseadistuse salvestamine ebaõnnestus"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1725,78 +1761,78 @@ msgstr ""
 "Kontrolli seadistuste kausta õiguseid, proovi valida teistsugune nimi või "
 "vabasta kettapinda"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 "Sama nimega seadistus juba eksisteerib. Vali seadistusele teistsugune nimi."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Viga"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Lisa uus kodeerija"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Muuda kodeerijat"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Eemalda eelseadistus"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "See kustutab valitud seadistuse. Oled sa kindel?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Kodeerijad"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Lisa DSP plugin"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "DSP seadistuse salvestamine ebaõnnestus"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Uus DSP seadistus"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "DSP seadistuse muutmine"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP seadistused"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Väljundkaust:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Väljundfaili nimi:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1806,89 +1842,89 @@ msgstr ""
 "Faililaiendused (näiteks .mp3) lisatakse automaatselt.\n"
 "Vaikimisi väärtuse jaoks jäta väli tühjaks (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Enkooder:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP seadistus:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Lõimede arv:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Väljundsämpli formaat:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Säilita allika formaat"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 bit signed int"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 bit signed int"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 bit signed int"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 bit signed int"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 bit float"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Kui fail on olemas:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Küsi"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Kirjuta üle"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Kodeerija seadistuste muutmine"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Ilma nimeta kodeerija"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Väljundfaili laiend:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Näiteks mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Käsurida:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1898,7 +1934,7 @@ msgstr ""
 "Näide: lame - %o\n"
 "%i sisendfail, %o väljundfail, - stdin jaoks"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1908,66 +1944,72 @@ msgstr ""
 "<small>%o - väljundfaili nimi\n"
 "%i - ajutise sisendfaili nimi</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Meetod:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Toru"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Ajutine fail"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Sildi kirjutaja</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "DSP seadistuse redaktor"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Ilma nimeta DSP seadistus"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Lisa"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Ei leitud pixmap faili: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1995,27 +2037,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2024,74 +2066,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2099,90 +2141,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2209,102 +2251,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/eu.po b/po/eu.po
index c698303..e5c2456 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# John Smith <aboutafteragain at gmail.com>, 2013
-# John Smith <aboutafteragain at gmail.com>, 2013
+# aboutafteragain <aboutafteragain at gmail.com>, 2013
+# aboutafteragain <aboutafteragain at gmail.com>, 2013-2014
+# aboutafteragain <aboutafteragain at gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 21:13+0000\n"
+"Last-Translator: aboutafteragain <aboutafteragain at gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/eu/)\n"
 "Language: eu\n"
@@ -20,17 +21,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "DeadBeeF %s-(r)i buruz"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeadBeeF %s-(r)en aldaketa egunkaria"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeadBeeF itzultzaileak"
@@ -87,44 +88,44 @@ msgstr "Zerotu aurreanplifikazioa"
 msgid "Zero Bands"
 msgstr "Zerotu bandak"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Aurrezarpenak"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "Egun 1 %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d egun %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Geldituta | %d pista | guztizko erreprodukzio-denbora: %s"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Estereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kb/s "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Pausatuta | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -132,752 +133,779 @@ msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d pista | guztizko "
 "erreprodukzio-denbora: %s"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Erreprodukzio-zerrenda berria"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Erreprodukzio-zerrenda berria (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Fitxadun erreprodukzio-zerrenda"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Erreprodukzio zerrenda"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "Zatitzailea (goi eta behe)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "Zatitzailea (ezker eta eskuin)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "Erreprodukzio zerrendaren fitxak"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Aukeraketaren propietateak"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Albumaren azala erakutsi"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "Esparrua"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "Espektroa"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Botoia"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr "Bilaketa-barra"
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr "Erreprodukzio kontrolak"
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr "Ozentasun barra"
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr "Txiptune ahotsak"
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Hutsegitea laguntza fitxategia irakurtzean"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Hutsegitea laguntza fitxategia kargatzean"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 "Erreproduzitzailea atzeko planoan lan egiten ari da. Orain ateratzen bazara, "
 "zeregin hauek bertan behera utziko ditu. Honek datuak galtzea eragin dezake."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "Ziur zaude atera nahi duzula?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Abisua"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Fitxategia"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Ireki fitxategia(k)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Gehitu fitxategia(k)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Gehitu karpeta(k)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Gehitu kokapena"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Erreprodukzio-zerrenda berria"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Kargatu erreprodukzio-zerrenda"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Gorde erreprodukzio-zerrenda"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Irten"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Garbitu"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Hautatu dena"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Desautatu dena"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Alderantzikatu hautapena"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Hautapena"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Kendu"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Moztu"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Aurkitu"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Ordenatu"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Izenburua"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Pista zenbakia"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Albuma"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Artista"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Data"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Ausazkoa"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Pertsonalizatua"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Hobespenak"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Ikusi"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Egoera-barra"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Ekualizadorea"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "Diseinu modua"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Erreproduzitu"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Ordena"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Lineala"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Nahastu pistak"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Nahastu albumak"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Errepikapenak"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Dena errepikatu"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Abesti bakarra errepikatu"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "Ez errepikatu"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Korritzeak erreprodukzioa jarraitzen du"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Kurtsoreak erreprodukzioa jarraitzen du"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Gelditu unekoaren ondoren"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Jauzi uneko pistara"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Aldaketa-egunkaria"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Honi buruz"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Itzultzaileak"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Gelditu"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Erreproduzitu"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pausatu"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Aurrekoa"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Hurrengoa"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Erreproduzitu ausazkoa"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Honi buruz"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Irten"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Laguntza"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Pistaren propietateak"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "Kokapena:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Aplikatu"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Itxi"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadatuak"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Propietateak"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Izenburua:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Sartu zutabe berriaren goiburua hemen"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Mota:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Elementuaren indizea"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Erreproduzitzen"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Albumaren azala"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Artista - Albuma"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Iraupena"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Pista zenbakia"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Taldea / Albuma Artista"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Formatua:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Lerrokatzea:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Ezkerrean"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Eskuinean"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Utzi"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_Ados"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Irteera plugina:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Irteera gailua:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Bihurtu beti 8 biteko audioa 16 bitera"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Soinua"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Replaygain modua:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Desgaitu"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Pista"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Replaygain gailurraren eskala"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Replaygain aurre-anplifikazioa:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Aurreanplifikazio orokorra:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Gehitu fitxategiak erreprodukzio-zerrenda honetara komando-lerrotik (edo "
 "fitxategi-kudeatzailetik):"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Berrezarri aurreko saioa abiatzean"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Ez gehitu fitxategietatik karpetak gehitzean"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "\"Gelditu unekoaren ondoren\" Auto-berrezarri"
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Erreproduzitu"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Konfiguratu"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP katearen aurrezarpenak"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Kargatu"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Ixteak erretilura minimizatzen du"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Ezkutatu sistemaren erretiluko ikonoa"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "Errusiar CP1251 detekzioa eta birkodeaketa gaitu"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Txinatar CP936 detekzioa eta birkodeaketa gaitu"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Interfazearen freskatze-maiztasuna (zenbatetan segundoko)"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "TItulu-barraren testua erreproduzitzean:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Titulu-barraren testua gelditutakoan:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "GUI plugina (aldatzeak berrabiaraztea eskatzen du):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Ezkutatu \"Ezabatu diskotik\" laster-menuko elementua"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 "Izendatu erreprodukzio-zerrendak automatikoki karpeta bakar bat gehitzean"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "GUI/Misc"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Indargabetu"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Aurreko planoa"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Atzeko planoa"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Bilaketa-barra/Bolumen-barraren koloreak"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Ertaina"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Argia"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Iluna"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Oinarrizkoa"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Testua"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Fitxen koloreak"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Indargabetu (GTK zuhaitz-ikuspegien gaiak galtzen dira, baina errendatzea "
 "azkartzen da)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Errenkada bikoitia"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Errenkada bakoitia"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Hautatutako errenkada"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Hautatutako testua"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Kurtsorea"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Erreprodukzio-zerrenda koloreak"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Koloreak"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Gaitu proxy zerbitzaria"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Proxy zerbitzariaren helbidea:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Proxy zerbitzaria ataka:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Proxy mota:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Proxy erabiltzaile-izena:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Proxy pasahitza:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "HTTP User Agent-a:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr "Content-Type mapeoa editatu"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Sarea"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr "<Ez ezarrita>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "Abio-lasterreko tekla globala"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -885,122 +913,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "Abio-lasterreko teklak"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Bertsioa: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Copyright-a"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Pluginak"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URLa:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "Taldekatzeko irizpidea ..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "Ordenatzeko irizpidea ..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Formatua"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Gorakorra"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Beherakorra"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Hautatu DSP plugina"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Plugina"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Etiketa-idazlearen ezarpenak"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Idatzi ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Idatzi ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Idatzi APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Soildu ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Soildu ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Soildu APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 bertsioa"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Gomendatua)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 karaktere-kodeketa (lehenetsia iso8859-1 da)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Idatzi ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr "Content-Type Mapeoa"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1008,91 +1042,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Artista / Albuma"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Pista zbk"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Gehitu erreprodukzio-ilarara"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Kendu erreprodukzio-ilaratik"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Birkargatu metadatuak"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Kendu diskotik"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Gehitu zutabea"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Editatu zutabea"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Kendu zutabea"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Taldekatzeko irizpidea"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Artista/Data/Albuma"
 
@@ -1109,11 +1152,11 @@ msgstr "Konfiguratu %s"
 msgid "Default Audio Device"
 msgstr "Audio gailu lehenetsia"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1121,7 +1164,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Fitxategiak gehitzen..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Hasieratzen..."
 
@@ -1134,104 +1177,104 @@ msgid "Really close the window?"
 msgstr "Ziur leihoa itxi nahi duzula?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Hainbat balio] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Gakoa"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Balioa"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[Hainbat balio] "
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Etiketak idazten..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "Eremu izena"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Izena:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Ezin dituzu : edo _ erabili eremu-izenen hasieran"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Ezin da eremua gehitu"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 "Izen hori duen eremua existitzen da dagoeneko, mesedez erabili izen "
 "desberdin bat."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Gehitu eremua"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Kendu eremua"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "Erabilera: deadbeef [aukerak] [--] [fitxategia(k)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Aukerak:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  or  -h     Inprimatu laguntza (mezu hau) eta irten\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Irten erreproduzitzailetik\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Inprimatu bertsio-informazioa eta irten\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Hasi erreprodukzioa\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Gelditu erreprodukzioa\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Pausatu erreprodukzioa\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Txandakatu pausatzea\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1239,42 +1282,42 @@ msgstr ""
 "   --play-pause       Hasi erreproduzitzen geldituta badago, bestela "
 "txandakatu pausa\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Erreprodukzio-zerrendako hurrengo kanta\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Erreprodukzio-zerrendako aurreko kanta\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Erreprodukzio-zerrendako ausazko kanta\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr ""
 "   --queue            Gehitu fitxategia(k) existitzen den erreprodukzio-"
 "zerrendara\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 "--gui PLUGIN-ek zein GUI plugin erabili esaten du, lehenetsia \"GTK2\" da\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 "   --nowplaying FMT   Inprimatu formatudun pista-izena irteera estandarrera\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1286,7 +1329,7 @@ msgstr ""
 "iruzkina,\n"
 "                      r: copyright-a, e: igarotakoa\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1295,28 +1338,24 @@ msgstr ""
 "                      adibidez.: --nowplaying \"%%a - %%t\" erabiliz gero "
 "\"artista - titulua\" inprimatuko du\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      Informazio gehiagorako, begiratu http://sourceforge."
-"net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Lehenetsia"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Bai"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Ez"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1342,7 +1381,7 @@ msgstr ""
 "Taldea / Albuma Artista\n"
 "Pertsonalizatua"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1350,7 +1389,7 @@ msgstr ""
 "Ezkerra\n"
 "Eskuina"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1360,7 +1399,7 @@ msgstr ""
 "Pista\n"
 "Albuma"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1368,7 +1407,7 @@ msgstr ""
 "Gorakorra\n"
 "Beherakorra"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1376,14 +1415,7 @@ msgstr ""
 "2.3 (Gomendatua)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Ezin izan da pixmap fitxategia aurkitu: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1396,8 +1428,8 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "Audio CDa gehitu"
+msgid "Add Audio CD"
+msgstr ""
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1693,8 +1725,8 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
-msgstr "Shell komando pertsonalizatuak konfiguratu"
+msgid "Configure Custom Shell Commands"
+msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
@@ -1710,35 +1742,40 @@ msgstr "Ken emuladorea Satoh-en gainetik hobetsi (surround ez da ibiliko)"
 msgid "Enable surround"
 msgstr "Surround gaitu"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Fitxategia dagoeneko existitzen da. Gainidatzi?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Bihurtzailearen abisua"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Mesedez hautatu kodetzailea"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Bihurtzailearen errorea"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Bihurtzen..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Hautatu karpeta..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Huts egin du kodetzailearen aurrezarpena gordetzean"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1746,79 +1783,79 @@ msgstr ""
 "Egiaztatu aurrezarpenen karpetaren baimenak, erabili beste izen bat edo egin "
 "leku librea diskoan"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 "Izen bereko aurrezarpen bat existitzen da dagoeneko. Aukeratu beste izenburu "
 "bat."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Errorea"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Gehitu kodetzaile berria"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Editatu kodetzailea"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Kendu aurrezarpena"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Ekintza honek hautatutako aurrezarpena ezabatuko du. Ziur zaude?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Kodetzaileak"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Gehitu plugina DSP kateari"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Hutsegitea DSP aurrezarpena gordetzean"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "DSP aurrezarpen berria"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Editatu DSP aurrezarpena"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP aurrezarpenak"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Irteerako karpeta:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr "Iturburu pista karpetan idatzi"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr "Karpeta egitura mantendu"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Irteerako fitxategi-izena:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1828,89 +1865,89 @@ msgstr ""
 "Luzapena (adibidez, .mp3) automatikoki gehituko da.\n"
 "Utzi eremua hutsik balio lehenetsia erabiltzeko (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Kodetzailea:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP aurrezarpena:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Hari kopurua:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Irteerako lagin-formatua:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Mantendu iturburuko formatua"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 biteko zeinudun osokoa"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 biteko zeinudun osokoa"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 biteko zeinudun osokoa"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 biteko zeinudun osokoa"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 biteko koma mugikorreko zenbakia"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Fitxategia existitzen denean:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Gonbita"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Gainidatzi"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Editatu kodetzailearen aurrezarpena"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Kodetzaile izengabeak"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Irteerako fitxategiaren luzapena:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Adibidez, mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Komando-lerroa:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1921,7 +1958,7 @@ msgstr ""
 "%i sarrerako fitxategiarentzat, %o irteerako fitxategiarentzat, - irteera "
 "estandarrarentzat"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1931,66 +1968,72 @@ msgstr ""
 "<small>%o - irteerako fitxategi-izena\n"
 "%i - aldi baterako sarrerako fitxategi-izena</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Metodoa:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Kanalizazioa"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Aldi baterako fitxategia"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Etiketa idazlea</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "DSP aurrezarpenen editorea"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Izenbururik gabeko DSP aurrezarpena"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Gehitu"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Ezin izan da pixmap fitxategia aurkitu: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2028,27 +2071,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr "Shell komando pertsonalizatuak"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "Editatu"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "Itxi"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "Editatu komandoa"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "Komandoa:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2060,17 +2103,17 @@ msgstr ""
 "testuinguruan exekutatuko da. Titulu formatua erabili daiteke. Adibidez: xdg-"
 "open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "IDa:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr "Era-libreko izena, adibidez \"Nire Shell Komandoa\""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
@@ -2079,57 +2122,57 @@ msgstr ""
 "Komandu IDa, normalean zerbait motza, adibidez \"youtube_open\". Izen soila "
 "izan behar du."
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr "Banakako Pistak"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "Banakako pistan badabil."
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "Pista Anitzak"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "Pista anitzetan badabil."
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "Lokala"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "Fitxategi lokaletan badabil."
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr "Urruneko"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr "Urruneko fitxategietan badabil (adib. http:// streams)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "Elementua menu nagusian agertu behar da"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2137,72 +2180,72 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Komandoa Gehitu"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "Ekintza honek hautatutako komandoa ezabatuko du. Ziur al zaude?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr "Berretsi Ezabatu"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr "IDa ezin da hutsik egon eta bakarra izan behar da.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr "Izenburua ezin da hutsik egon.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr "Shell Komandoa ezin da hutsik egon.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "Balio Baliogabeak"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr "Onartutako soinu formatuak"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "Fitxategi guztiak (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr "Ireki fitxategia(k)..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr "Fitxategia(k) erreprodukzio-zerrendara gehitu..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr "Karpeta(k) erreprodukzio-zerrendara gehitu..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr "Symlink-ak segi"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "Fitxategiak diskotik ezabatu"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -2210,19 +2253,19 @@ msgstr ""
 "FItxategiak galdu egingo dira. Jarraitu?\n"
 "(Hizketa hau GTK UI plugin aukeretan desgaitu daiteke)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "Erreprodukzio zerrenda kargatu"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "Beste fitxategiak (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr "Erreprodukzio-zerrenda ... gisa gorde"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF erreprodukzio-zerrenda fitxategiak (*.dbpl)"
 
@@ -2249,102 +2292,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 6447557..1f1da24 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/fa/)\n"
 "Language: fa\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "درباره DeaDBeef %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "گزارش تغییرات %s DeaDBeeF"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr ""
@@ -87,789 +87,816 @@ msgstr "صفر کردن پیش تقویت کننده"
 msgid "Zero Bands"
 msgstr "نوارهای صفر"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "۱ روز %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d روز %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "متوقف| %d آهنگ| %s کل زمان پخش"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "تک کاناله"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "استریو"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d کیلو بیت بر ثانیه"
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "مکث کرده|"
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dهرتز | %d بیت | %s | %d:%02d / %s | %d آهنگ | %s کل زمان پخش"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "لیست پخش جدید"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "لیست پخش جدید (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "شکست در خواندن فایل کمک"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "شکست در بارگذاری فایل کمک"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "هشدار"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_ پرونده"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_باز کردن پرونده(ها)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "افزودن پرونده(ها)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "افزودن پوشه(ها)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "افزودن محل"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "لیست پخش جدید"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "بارگذاری لیست پخش"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "ذخیره لیست پخش"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_ خروج"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_ویرایش"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_ پاک سازی"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "انتخاب همگی"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "از انتخاب درآوردن همگی"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "انتخاب معکوس"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "انتخاب"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "حذف"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "محصول"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_یافتن"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "عنوان"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "آلبوم"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "هنرمند"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "اتفاقی"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "شخصی"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "تنظیمات"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_نما"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "نوار وضعیت"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "اکولایزر"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_پخش"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "ترتیب"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "خطی"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "حلقه‌ زنی"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "پیمایش،پخش را دنبال می‌کند"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "مکان نما پخش را دنبال می‌کند"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "توقف پس از کنونی"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_ کمک"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_تغییرات"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_درباره"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "جستجوی"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "توقف"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "پخش"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "مکث"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "قبلی"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "بعدی"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "پخش اتفاقی"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "درباره"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "خروج"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "کمک"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "ویژگی آهنگ"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "ـ اعمال"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "ـ بستن"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "فرا داده"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "ویژگی‌ها"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "عنوان:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "ستون عنوان جدید را اینجا وارد کنید"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "نوع:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr ""
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "در حال پخش"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "آلبوم هنری"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "هنرمند-آلبوم"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "مدت زمان"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "هنرمند آلبوم/گروه"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "قالب:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "هم‌ترازی:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "چپ"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "راست"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "ـ لغو"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "ـ قبول"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "افزونه خروجی:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "دستگاه خروجی:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "صوت"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "حالت پخش مجدد:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "غیرفعال"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "آهنگ"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "پخش مجدد مقیاس قله"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "افزودن فایل‌ها از خط فرمان (‌یا مدیر فایل) به این فهرست پخش:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "ادامه نشست قبلی در این آغاز به کار"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "پخش"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "پیکره‌بندی:"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "بستن حداقل شده‌ها برای رفتن به سینی"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "مخفی کردن آیکون سینی سیستم"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "متن نوار عنوان در زمان پخش:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "متن نوار عنوان در زمان توقف:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "مخفی کردن متن «حذف از دیسک» از منو"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "غلبه"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "پیش زمینه"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "پس‌زمینه"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "رنگ‌های نوار پویش/ حجم صدا"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "متوسط"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "روشن"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "تیره"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "پایه"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "متن"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "رنگ‌های نوار لبه"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "غلبه (درختواره GTK ضعیف می‌شود اما سرعت نمایش افزایش می‌یابد)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "ردیف زوج"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "ردیف فرد"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "ردیف انتخاب شده"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "متن انتخاب شده"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "مکان‌نما"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "رنگ‌های فهرست پخش"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "رنگ‌ها"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "فعال سازی خادم پروکسی"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "آدرس سرویس دهنده پروکسی:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "درگاه سرویس دهنده پروکسی:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "نوع پروکسی:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "نام کاربری پروکسی:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "گذرواژه پروکسی:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "شبکه"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -877,122 +904,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "افزونه‌ها"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "آدرس اینترنتی:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "بنویسید ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "بنویسید ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "بنویسید APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "ID3v2 را پاک کنید"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "ID3v1 را پاک کنید"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "APEv2 را پاک کنید"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "نسخه ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "۲٫۳ (پیشنهاد شده)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "۲٫۴"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "کدگشایی کاراکتر ID3v1 (پیش‌فرض iso8859-1 است)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "بنویسید ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1000,91 +1033,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "هنرمند/آلبوم"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "شماره آهنگ"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "افزودن به صف پخش"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "حذف از صف پخش"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "بارگذاری مجدد ابرداده"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "حذف از دیسک"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "افزودن ستون"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "ویرایش ستون"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "حذف ستون"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "گروه با"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "هیچ"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "هنرمند/تاریخ/آلبوم"
 
@@ -1101,11 +1143,11 @@ msgstr ""
 msgid "Default Audio Device"
 msgstr "دستگاه صوتی پیش‌فرض"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1113,7 +1155,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "افزودن فایل‌ها..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "آماده سازی اولیه..."
 
@@ -1126,139 +1168,139 @@ msgid "Really close the window?"
 msgstr "واقعا می‌خواهید پنجره را ببندید؟"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "کلید"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "مقدار"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr ""
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "گزینه‌ها: \n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "--help    یا     -h   کمک(این پیام) را نشان می‌دهد و خارج می‌شود \n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "--quit          از پخش کننده خارج می‌شود \n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "--version           اطلاعات نسخه را نمایش می‌دهد و خارج می‌شود \n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "--play         پخش را آغاز می‌کند\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "--stop          پخش را متوقف می‌کند\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "--pause          پخش را مکث می‌دهد\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "--next     آهنگ بعدی در فهرست پخش\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "--prev        آهنگ قبلی در فهرست پخش\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "--random          آهنگ اتفاقی در فهرست پخش\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "--queue          پیوست کردن پرونده(ها) به فهرست پخش موجود\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "--nowplaying FMT     چاپ نام آهنگ قالب‌بندی شده در خروجی استاندارد\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1269,33 +1311,31 @@ msgstr ""
 "                      [م]دت زمان، شم[ا]ره آهنگ، [س]ال،[ن]ظر،\n"
 "                      حق[ن]شر،[س]پری شده\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr "مثال: \"%%a - %%t\" باید \"هنرمند-عنوان\" را چاپ کند\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "پیش‌فرض"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "بله"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "خیر"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1310,7 +1350,7 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1318,7 +1358,7 @@ msgstr ""
 "چپ\n"
 "راست"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1328,13 +1368,13 @@ msgstr ""
 "آهنگ\n"
 "آلبوم"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1342,14 +1382,7 @@ msgstr ""
 "۲٫۳ (توصیه شده)\n"
 "۲٫۴"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "پرونده تصویر بیتی پیدا نشد:%s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1361,7 +1394,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1654,7 +1687,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1671,111 +1704,116 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr ""
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1783,89 +1821,89 @@ msgid ""
 "Leave the field empty for default (%a - %t)."
 msgstr ""
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr ""
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr ""
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1873,7 +1911,7 @@ msgid ""
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1881,66 +1919,72 @@ msgid ""
 "%i - temporary input file name</small>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr ""
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr ""
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr ""
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "افزودن"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "پرونده تصویر بیتی پیدا نشد:%s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1968,27 +2012,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -1997,74 +2041,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2072,90 +2116,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2182,102 +2226,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 036751b..950b627 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# elain1 <heikki.auvinen at gmail.com>, 2014
+# elain1 <heikki.auvinen at gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/fi/)\n"
 "Language: fi\n"
@@ -18,17 +20,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Tietoja ohjelmasta DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s:n muutosloki"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeFin kääntäjät"
@@ -85,1009 +87,1061 @@ msgstr "Nollaa esivahvistin"
 msgid "Zero Bands"
 msgstr "Nollaa kanavat"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Esiasetukset"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 päivä %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d päivää %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Pysäytetty | %d raitaa | kokonaiskesto %s"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d Kb/s "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Keskeytetty | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bittiä | %s | %d:%02d / %s | %d raitaa | kokonaiskesto %s"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Uusi soittolista"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Uusi soittolista (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
-msgstr ""
+msgstr "Soittolista välilehdillä"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
-msgstr ""
+msgstr "Soittolista"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
-msgstr ""
+msgstr "Jakaja (ylä- ja alapuoli)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
-msgstr ""
+msgstr "Jakaja (vasen ja oikea)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
-msgstr ""
+msgstr "Soittolista välilehdet"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
-msgstr ""
+msgstr "Valinnan ominaisuudet"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
-msgstr ""
+msgstr "Albumin kuvituksen näyttö"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
-msgstr ""
+msgstr "Oskilloskooppi"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
-msgstr ""
+msgstr "Spektri"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
-msgstr ""
+msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
-msgstr ""
+msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
+msgstr "Painike"
+
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Virhe ohjetiedostoa avattaessa"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Ohjetiedoston avaaminen epäonnistui"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
-msgstr ""
+msgstr "Haluatko silti poistua?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Avaa tiedosto(ja)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Lisää tiedosto(ja)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Lisää hakemisto(ja)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Lisää sijainti"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Uusi soittolista"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Avaa soittolista"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Tallenna soittolista"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Tyhjennä"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Valitse kaikki"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Poista valinta"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Käännä valinta"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Valinta"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Poista"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Rajaa"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Etsi"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
-msgstr ""
+msgstr "Järjestä"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Nimi"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Raidan numero"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Albumi"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Artisti"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Päivämäärä"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Satunnainen"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Mukautettu"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Tilapalkki"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Taajuuskorjain"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
-msgstr ""
+msgstr "Suunnittelutila"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "T_oisto"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Järjestys"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Lineaarinen"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Sekoita raitoja"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Sekoita albumeita"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Toisto"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
-msgstr ""
+msgstr "Toista kaikki"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
-msgstr ""
+msgstr "Toista yksittäistä kappaletta"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
-msgstr ""
+msgstr "Älä toista"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Vieritys seuraa toistoa"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Hiiri seuraa toistoa"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Pysäytä tämän kappaleen jälkeen"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Hyppää nykyiseen raitaan"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Ohje"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Muutosloki"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Kääntäjät"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Etsi"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Soita"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Tauko"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Toista satunnainen"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Tietoja"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Ohje"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Raidan ominaisuudet"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
-msgstr ""
+msgstr "Sijainti:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Asetukset"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Käytä"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metatiedot"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Nimi:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Anna uuden rivin otsikko"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "KOhteen indeksi"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Soitetaan"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Albumin Kuvitus"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Artisti - Albumi"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Kesto"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Raidan Numero"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Yhtye / Albumin artisti"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Tiedostomuoto:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Kohdistus:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Vasen"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Oikea"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Peruuta"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Ulostuloliitännäinen:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Ulostulolaite:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Muunna aina 8-bittinen ääni 16-bittiseksi"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
-msgstr ""
+msgstr "Muunna aina 16-bittinen ääni 24-bittiseksi"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Ääni"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Replaygain-tila:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Pois päältä"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Raita"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Replaygain-huippuskaala"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Replaygain-esivahvistus:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Yleinen esivahvistus:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Lisää tiedostoja komentoriviltä (tai tiedostonhallinnasta) tähän "
 "soittolistaan:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Palauta edellinen istunto käynnistyksessä"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Älä lisää arkistoista lisättäessä kansioita"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Toisto"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Tee asetukset"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP ketjuesiasetus"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Lataa"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Pienennä ilmaisinalueelle suljettaessa"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Piilota ilmaisinalueen kuvake"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
+"Ota käyttöön CP1251 -merkistökoodauksen tunnistus ja muuntaminen (venäjä)"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
+"Ota käyttöön CP936 -merkistökoodauksen tunnistus ja muuntaminen (kiina)"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Käyttöliittymän päivitysnopeus (kertaa sekunnissa):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Otsikkopalkin teksti toistettaessa:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Otsikkopalkin teksti, kun toisto on pysäytetty:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 "Käyttöliittymäliitännäinen (vaihtaminen vaatii ohjelman "
 "uudellenkäynnistyksen):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
-msgstr ""
+msgstr "Soitin"
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Sulje soittolistoja hiiren keskimmäisellä painikkeella"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
-msgstr ""
+msgstr "Näytä soiva raita lihavoituna"
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Piilota \"Poista levyltä\"-kontekstivalinta"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Nimeä soittolista automaattisesti lisättäessä yksittäinen kansio"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "Sovita sarakkeet ikkunaan"
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
-msgstr ""
+msgstr "GUI/Sekalainen"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Ohita"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Etuala"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Tausta"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Etsintä-/äänenvoimakkuuspalkin värit"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Keski"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Kevyt"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Tumma"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Pohja"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Teksti"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Välilehden värit"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Ohita asetus (GTKn treeview-teema menetetään, mutta nopeuttaa renderöintiä)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Parillinen rivi"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Pariton rivi"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Valittu rivi"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Valittu teksti"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Hiiriosoitin"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Soittolistojen värit"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Värit"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Ota käyttöön välityspalvelin"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Välityspalvelimen osoite:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Välityspalvelimen portti:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Välityspalvelimen tyyppi:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Välityspalvelimen käyttäjänimi:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Välityspalvelimen salasana:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
-msgstr ""
+msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
-msgstr ""
+msgstr "Muokkaa sisältötyypin kartoitusta"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Verkko"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
-msgstr ""
+msgstr "Määritellyt pikanäppäimet:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
-msgstr ""
+msgstr "Toiminto:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
-msgstr ""
+msgstr "<Ei ole asetettu>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
-msgstr ""
+msgstr "Näppäinyhdistelmä:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
-msgstr ""
+msgstr "Yleinen pikanäppäin"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
 msgstr ""
+"Tallenna muutokset Käytä painikkeella,\n"
+"tai peruuta muutokset Palauta painikkeella.\n"
+"Muutoksia EI tallenneta\n"
+"jos et paina Käytä painiketta."
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
-msgstr ""
+msgstr "_Oletukset"
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
-msgstr ""
+msgstr "Pikanäppäimet"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Versio: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Tekijänoikeus"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
-msgid "Group By ..."
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+msgid "Group By ..."
+msgstr "Ryhmitä..."
+
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
-msgstr ""
+msgstr "Järjestä..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Tiedostomuoto"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Nouseva"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Laskeva"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Valitse DSP-liitännäinen"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Liitännäinen"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Tagikirjoittajan asetukset"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Kirjoita ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Kirjoita ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Kirjoita APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Poista ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Poista ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Poista APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 versio"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (suositeltu)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1-merkistökoodaus (oletus: iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Kirjoita ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
-msgstr ""
+msgstr "Sisältötyypin kartoitus"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
+"Tämä taulukko määrittää verkon suoratoiston sisältötyypin ja DeaDBeeFin "
+"dekooderiliitännäisten sidoksen. Esimerkiksi, mp3-tiedostot voivat olla "
+"sisältötyypiltään \"audio/x-mpeg\", ja ne pitää dekoodata joko DeaDBeeFin "
+"omalla \"stdmpg\"-liitännäisellä tai \"ffmpeg\"-liitännäisellä."
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
-msgstr ""
+msgstr "Palauta oletukset"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
-msgstr ""
+msgstr "Sisällön-Tyyppi:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
-msgstr ""
+msgstr "Liitännäiset"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
-msgstr ""
+msgstr "Painikkeen ominaisuudet"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
-msgstr ""
+msgstr "Väri:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
-msgstr ""
+msgstr "Tekstin väri"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
-msgstr ""
+msgstr "Kuvake:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
-msgstr ""
+msgstr "Nimike:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
+msgstr "Valitse toiminto"
+
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Artisti / Albumi"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Raita nro"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Lisää toistojonoon"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Poista toistojonosta"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Lataa metatiedot uudelleen"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Poista levyltä"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Lisää sarake"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Muokkaa saraketta"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Poista sarake"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
-msgstr ""
+msgstr "Kiinnitä ryhmät vierittäessä"
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Ryhmittele"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Artisti/Pvm/Albumi"
 
@@ -1104,19 +1158,19 @@ msgstr "Tee asetukset %s"
 msgid "Default Audio Device"
 msgstr "Oletusäänilaite"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr ""
+msgstr "Muokkasit pikanäppäinasetuksia, mutta et tallentanut muutoksiasi."
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
-msgstr ""
+msgstr "Haluatko varmasti jatkaa ilman tallentamista?"
 
 #: ../plugins/gtkui/progress.c:56
 msgid "Adding files..."
 msgstr "Lisätään tiedostoja..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Alustetaan..."
 
@@ -1129,102 +1183,102 @@ msgid "Really close the window?"
 msgstr "Haluatko varmasti sulkea tämän ikkunan?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Useita arvoja] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Avain"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Arvo"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
-msgstr ""
+msgstr "[Useita arvoja]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Kirjoitetaan tageja..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
-msgstr ""
+msgstr "Kentän nimi"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Tiedostonimet eivät voi alkaa merkeillä : tai _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Kenttää ei voi lisätä"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Samanniminen kenttä on jo olemassa, yritä toista nimeä."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Lisää kenttä"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Poista kentät"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
-msgstr ""
+msgstr "Käyttö: deadbeef [asetukset] [--] [tiedosto(t)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Valitsimet:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  tai  -h    Näytä ohje (tämä viesti) ja poistu\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Sulje soitin\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Näytä versiotiedot ja poistu\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Aloita toisto\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Pysäytä toisto\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Keskeytä toisto\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Vaihda keskeytyksen ja toiston välillä\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1232,39 +1286,41 @@ msgstr ""
 "   --play-pause       Aloita toisto, jos pysäytetty, muuten vaihda "
 "keskeytyksen ja toiston välillä\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Seuraava kappale soittolistalla\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Edellinen kappale soittolistalla\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Satunnainen kappale soittolistalla\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr ""
 "   --queue            Lisää tiedosto(t) olemassa olevaan soittolistaan\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
+"--gui PLUGIN Kertoo mitä graafisen käyttöliittymän liitännäistä käytetään, "
+"oletus on \"GTK2\"\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Tulosta muotoiltu raidan nimi stdoutiin\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1275,7 +1331,7 @@ msgstr ""
 "                      [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 "                      copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1284,28 +1340,24 @@ msgstr ""
 "                      esim.: --nowplaying \"%%a - %%t\" tulostaa \"artisti - "
 "otsikko\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      lisätietoja osoitteessa http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Oletus"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Ei"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1331,7 +1383,7 @@ msgstr ""
 "Bändi / Albumin artisti\n"
 "Mukautettu"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1339,7 +1391,7 @@ msgstr ""
 "Vasen\n"
 "Oikea"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1349,7 +1401,7 @@ msgstr ""
 "Raita\n"
 "Albumi"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1357,7 +1409,7 @@ msgstr ""
 "Nouseva\n"
 "Laskeva"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1365,14 +1417,7 @@ msgstr ""
 "2.3 (suositeltu)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Bittikarttatiedostoa ei löydetty: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1385,7 +1430,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1395,7 +1440,7 @@ msgstr "Etsi Last.fm-palvelusta"
 #. ALSA output plugin
 #: ../translation/extra.c:6
 msgid "Use ALSA resampling"
-msgstr ""
+msgstr "Käytä ALSA:n uudelleennäytteistystä"
 
 #: ../translation/extra.c:7
 msgid "Release device while stopped"
@@ -1403,11 +1448,11 @@ msgstr "Vapauta laite, kun toisto on lopetettu"
 
 #: ../translation/extra.c:8 ../translation/extra.c:55
 msgid "Preferred buffer size"
-msgstr ""
+msgstr "Ensisijainen puskurin koko"
 
 #: ../translation/extra.c:9
 msgid "Preferred period size"
-msgstr ""
+msgstr "Ensisijainen jakson koko"
 
 #. Last.fm plugin
 #: ../translation/extra.c:11
@@ -1432,7 +1477,7 @@ msgstr "Scrobble URL"
 
 #: ../translation/extra.c:16
 msgid "Prefer Album Artist over Artist field"
-msgstr ""
+msgstr "Suosi Albumin artistia Artisti-kentän edelle"
 
 #. OSS output plugin
 #: ../translation/extra.c:18
@@ -1441,7 +1486,7 @@ msgstr "Laitetiedosto"
 
 #: ../translation/extra.c:19
 msgid "OSS4 samplerate bug workaround"
-msgstr ""
+msgstr "OSS4 näytteenottotaajuusongelman kiertäminen"
 
 #. Album Artwork plugin
 #: ../translation/extra.c:21
@@ -1458,7 +1503,7 @@ msgstr "Nouda paikallisesta kansiosta"
 
 #: ../translation/extra.c:24
 msgid "Local cover file mask"
-msgstr ""
+msgstr "Paikallinen peitetiedostomaski"
 
 #: ../translation/extra.c:25
 msgid "Fetch from last.fm"
@@ -1500,11 +1545,11 @@ msgstr "Ota käyttöön tuki NRG-levykuville"
 #. DUMB module player plugin
 #: ../translation/extra.c:36
 msgid "Resampling quality (0..2, higher is better)"
-msgstr ""
+msgstr "Uudelleennäytteistyksen laatu (0..2, suurempi on parempi)"
 
 #: ../translation/extra.c:37
 msgid "8-bit output (default is 16)"
-msgstr ""
+msgstr "8-bittinen ulostulo (vakio on 16)"
 
 #. Game_Music_Emu decoder plugin
 #: ../translation/extra.c:39
@@ -1513,11 +1558,11 @@ msgstr "Kappaleen maksimipituus (minuuteissa)"
 
 #: ../translation/extra.c:40
 msgid "Fadeout length (seconds)"
-msgstr ""
+msgstr "Loppuhäivytyksen pituus (sekunneissa)"
 
 #: ../translation/extra.c:41
 msgid "Play loops nr. of times (if available)"
-msgstr ""
+msgstr "Toistojen määrä (jos käytössä)"
 
 #. Standard GTK2 user interface plugin
 #: ../translation/extra.c:43
@@ -1526,7 +1571,7 @@ msgstr "Kysy vahvistus ennen kuin tiedostoja poistetaan levyltä"
 
 #: ../translation/extra.c:44
 msgid "Status icon volume control sensitivity"
-msgstr ""
+msgstr "Ilmaisinaluekuvakkeen äänenvoimakkuuden säädön herkkyys"
 
 #: ../translation/extra.c:45
 msgid "Custom status icon"
@@ -1538,16 +1583,16 @@ msgstr "Suorita gtk_init --sync-valitsimen kanssa (virheenjäljitystila)"
 
 #: ../translation/extra.c:47
 msgid "Add separators between plugin context menu items"
-msgstr ""
+msgstr "Käytä erottajia liitännäisten kontekstivalintojen väleissä"
 
 #. OSD Notify plugin
 #: ../translation/extra.c:49
 msgid "Notification title format"
-msgstr ""
+msgstr "Ilmoituksen otsikon muoto"
 
 #: ../translation/extra.c:50
 msgid "Notification content format"
-msgstr ""
+msgstr "Ilmoituksen sisällön muoto"
 
 #: ../translation/extra.c:51
 msgid "Show album art"
@@ -1569,24 +1614,24 @@ msgstr "Näytetaajuus"
 #. SHN player plugin
 #: ../translation/extra.c:58
 msgid "Relative seek table path"
-msgstr ""
+msgstr "Suhteellinen hakutalukon polku"
 
 #: ../translation/extra.c:59
 msgid "Absolute seek table path"
-msgstr ""
+msgstr "Absoluuttiinen hakutaulukon polku"
 
 #: ../translation/extra.c:60
 msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr ""
+msgstr "Vaihda audiotavuja (käytä jos kuulet pelkkää kohinaa)"
 
 #. SID decoder plugin
 #: ../translation/extra.c:62
 msgid "Enable HVSC Songlength DB"
-msgstr ""
+msgstr "Ota käyttöön HVSC kappaleiden pituustietokanta"
 
 #: ../translation/extra.c:63
 msgid "Songlengths.txt (from HVSC)"
-msgstr ""
+msgstr "HVSC:n songlengths.txt"
 
 #: ../translation/extra.c:64
 msgid "Bits per sample (8 or 16)"
@@ -1599,7 +1644,7 @@ msgstr "Kappaleen oletuspituus (sek)"
 #. WildMidi player plugin
 #: ../translation/extra.c:67
 msgid "Timidity++ bank configuration file"
-msgstr ""
+msgstr "Timidity++ asetustiedosto"
 
 #: ../translation/extra.c:70
 msgid "Track Title"
@@ -1639,11 +1684,11 @@ msgstr "Sijainti"
 
 #: ../translation/extra.c:84
 msgid "Subtrack Index"
-msgstr ""
+msgstr "Aliraitaindeksi"
 
 #: ../translation/extra.c:85
 msgid "Tag Type(s)"
-msgstr ""
+msgstr "Tagien tyypit"
 
 #: ../translation/extra.c:86
 msgid "Embedded Cuesheet"
@@ -1666,140 +1711,148 @@ msgstr "Muunna"
 #. Resampler (Secret Rabbit Code)
 #: ../translation/extra.c:93
 msgid "Target Samplerate"
-msgstr ""
+msgstr "Tavoite näytteenottotaajuus"
 
 #: ../translation/extra.c:94
 msgid "Quality / Algorithm"
-msgstr ""
+msgstr "Laatu / Algoritmi"
 
 #: ../translation/extra.c:95
 msgid "Automatic Samplerate (overrides Target Samplerate)"
 msgstr ""
+"Automaattinen näytteenottotaajuus (korvaa tavoite näytteenottotaajuuden)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
 msgid "Disable gapless playback (faster scanning)"
-msgstr ""
+msgstr "Ota tauoton toisto pois käytöstä (nopeampi skannaus)"
 
 #. adplug
 #: ../translation/extra.c:101
 msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr ""
+msgstr "Suosi Ken-emulointia Satohin edelle (tilaääni ei toimi)"
 
 #: ../translation/extra.c:102
 msgid "Enable surround"
+msgstr "Ota käyttöön tilaääni"
+
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Tiedosto on jo olemassa. Ylikirjoita?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
-msgstr ""
+msgstr "Muuntimen varoitus"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Valitse koodekki"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
-msgstr ""
+msgstr "Muuntimen virhe"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Muunnetaan..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Valitse kansio..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
-msgstr ""
+msgstr "Enkooderin esiasetuksen tallentaminen epäonnistui."
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
+"Tarkista esiasetuskansion käyttöoikeudet, yritä keksiä toinen nimi tai "
+"vapauta levytilaa."
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
-msgstr ""
+msgstr "Esiasetus samalla nimellä on jo olemassa. Yritä keksiä toinen nimi."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Virhe"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
-msgstr ""
+msgstr "Lisää uusi enkooderi"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
-msgstr ""
+msgstr "Muokkaa enkooderia"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Poista esiasetus"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
-msgstr ""
+msgstr "Tämä toiminto poistaa valikoidun esiasetuksen. Oletko varma?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
-msgstr ""
+msgstr "Enkooderit"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
-msgstr ""
+msgstr "Lisää liitännäinen DSP-ketjuun"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
-msgstr ""
+msgstr "DSP-esiasetuksen tallennus epäonnistui"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Uusi DSP-esiasetus"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Muokkaa DSP-esiasetusta"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP-esiasetukset"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
-msgstr ""
+msgstr "Ulostulokansio:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
-msgstr ""
+msgstr "Tallenna lähdekansioon"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
-msgstr ""
+msgstr "Säilytä kansiorakenne"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
-msgstr ""
+msgstr "Ulostulotiedoston nimi:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1809,89 +1862,89 @@ msgstr ""
 "Tiedoston pääte (esim. .mp3) lisätään automaattisesti.\n"
 "Jätettäessä tyhjäksi oletus on (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
-msgstr ""
+msgstr "Enkooderi:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP-esiasetus:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
-msgstr ""
+msgstr "Säikeiden määrä:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
-msgstr ""
+msgstr "Ulostulon näytemuoto:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
-msgstr ""
+msgstr "Pidä lähteen tiedostomuoto"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
-msgstr ""
+msgstr "8 bit signed int"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
-msgstr ""
+msgstr "16 bit signed int"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
-msgstr ""
+msgstr "24 bit signed int"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
-msgstr ""
+msgstr "32 bit signed int"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
-msgstr ""
+msgstr "32 bit float"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Kun tiedosto on jo olemassa:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Kysy"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Ylikirjoita"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Muokkaa enkooderin esiasetusta"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
-msgstr ""
+msgstr "Nimeämätön enkooderi"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
-msgstr ""
+msgstr "Ulostulon tiedostopääte:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Esim. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Komentorivi:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1901,74 +1954,82 @@ msgstr ""
 "Esimerkki: lame - %o\n"
 "%i on sisääntulotiedosto, %o on ulostulotiedosto, - on stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
 "<small>%o - output file name\n"
 "%i - temporary input file name</small>"
 msgstr ""
+"<small>%o - ulostulotiedoston nimi\n"
+"%i - väliaikaisen sisääntulotiedoston nimi</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
-msgstr ""
+msgstr "Menetelmä:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
-msgstr ""
+msgstr "Putki"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Tilapäinen tiedosto"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "Ogg Vorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
-msgstr ""
+msgstr "<b>Tagikirjoittaja</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
-msgstr ""
+msgstr "DSP-esiasetuksen muokkain"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
-msgstr ""
+msgstr "Nimeämätön DSP-esiasetus"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Lisää"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Bittikarttatiedostoa ei löydetty: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1978,45 +2039,55 @@ msgid ""
 "32 bit signed int\n"
 "32 bit float"
 msgstr ""
+"Pidä lähteen tiedostomuoto\n"
+"8 bit signed int\n"
+"16 bit signed int\n"
+"24 bit signed int\n"
+"32 bit signed int\n"
+"32 bit float"
 
 #: ../plugins/converter/converter.glade.h:19
 msgid ""
 "Prompt\n"
 "Overwrite"
 msgstr ""
+"Kysy\n"
+"Ylikirjoita"
 
 #: ../plugins/converter/converter.glade.h:34
 msgid ""
 "Pipe\n"
 "Temporary file"
 msgstr ""
+"Putki\n"
+"Väliaikainen tiedosto"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
-msgstr ""
+msgstr "Mukautetut komentotulkkikomennot"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
-msgstr ""
+msgstr "Muokkaa"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
-msgstr ""
+msgstr "Sulje"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
-msgstr ""
+msgstr "Muokkaa komentoa"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
-msgstr ""
+msgstr "Komento:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2024,176 +2095,186 @@ msgid ""
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
 msgstr ""
+"Mielivaltainen komentotulkin komento. Suoritetaan samassa komentotulkin "
+"kontekstissa jossa sovellus käynnistettiin. Otsikkomuotoilua voidaan "
+"käyttää. Esimerkiksi: xdg-open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
-msgstr ""
+msgstr "Tunniste:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
-msgstr ""
+msgstr "Vapaamuotoinen nimi, esim. \"Minun komentotulkkikomentoni\""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
+"Komennon tunnisteen tulisi normaalisti olla jotain lyhyttä, esim. "
+"\"youtube_open\" ja sen täytyy olla uniikki."
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
-msgstr ""
+msgstr "Yksittäiset raidat"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
-msgstr ""
+msgstr "Toimii yksittäisillä raidoilla"
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
-msgstr ""
+msgstr "Useat raidat"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
-msgstr ""
+msgstr "Toimii useilla raidoilla"
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
-msgstr ""
+msgstr "Paikallinen"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
-msgstr ""
+msgstr "Toimii paikallisilla tiedostoilla."
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
-msgstr ""
+msgstr "Etä"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
-msgstr ""
+msgstr "Toimii etätiedostoilla (esim. http:// suoratoistot)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "Yleinen (Päävalikko)"
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
-msgstr ""
+msgstr "Kohteen pitäisi näkyä päävalikossa"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version.</small>"
 msgstr ""
+"<small>Jos haluat lisätä komennon päävalikkoon, varmista että otsikko "
+"sisältää valikkopolun tähän tapaan: \"File/Minun komentoni\", jossa File on "
+"Tiedosto-valikon nimi englanninkielisessä versiossa.</small>"
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
-msgstr ""
+msgstr "Lisää komento"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
-msgstr ""
+msgstr "Poista"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr ""
+msgstr "Tämä toiminto poistaa valikoidun komentotulkkikomennon. Oletko varma?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
-msgstr ""
+msgstr "Vahvista Poistaminen"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
-msgstr ""
+msgstr "Tunnisteen pitää olla uniikki, eikä sitä saa jättää tyhjäksi.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
-msgstr ""
+msgstr "Otsikko ei voi olla tyhjä.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
-msgstr ""
+msgstr "Komentotulkkikomento ei voi olla tyhjä.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
-msgstr ""
+msgstr "Virheellinen arvo"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
-msgstr ""
+msgstr "Tuetut äänityypit"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
-msgstr ""
+msgstr "Kaikki tiedostot (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
-msgstr ""
+msgstr "Avaa tiedosto(ja)..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
-msgstr ""
+msgstr "Lisää tiedosto(ja) soittolistalle..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
-msgstr ""
+msgstr "Lisää kansio(ita) soittolistalle..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
-msgstr ""
+msgstr "Seuraa symbolisia linkkejä"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
-msgstr ""
+msgstr "help.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
-msgstr ""
+msgstr "Poisto tiedostot kiintolevyltä"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
+"Tiedostot häviävät. Jatketaanko?\n"
+"(Tämän valintaikkunan voi sammuttaa GTKUI-liitännäisen asetuksista)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
-msgstr ""
+msgstr "Avaa Soittolista"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
-msgstr ""
+msgstr "Muut tiedostot (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
-msgstr ""
+msgstr "Tallenna Soittolista Nimellä"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr ""
+msgstr "DeaDBeeFin soittolistatiedostot (*.dbpl)"
 
 #: ../plugins/gtkui/ctmapping.c:129
 msgid "Content-Type"
-msgstr ""
+msgstr "Sisällön-Tyyppi"
 
 #: ../plugins/gtkui/ctmapping.c:199
 msgid "Invalid value(s)."
-msgstr ""
+msgstr "Virheellinen arvo."
 
 #: ../plugins/gtkui/ctmapping.c:200
 msgid ""
@@ -2205,107 +2286,124 @@ msgid ""
 "Content type should be only letters, numbers and '-' sign.\n"
 "Plugin id can contain only letters and numbers."
 msgstr ""
+"Sisällöntyyppi- ja liitännäiskentät eivät voi olla tyhjiä ja niiden pitää "
+"noudattaa sääntöjä.\n"
+"Esimerkiksi sisällöntyyppi: 'audio/mpeg'.\n"
+"Esimerkiksi liitännäisten tunnisteet: 'stdmpg ffmpeg'.\n"
+"Välilyöntiä tulee käyttää erottimena liitännäisten tunnisteita "
+"listattaessa.\n"
+"Sisällöntyyppi tulee olla ainoastaan kirjaimia, numeroita ja '-' merkki.\n"
+"Liitännäisen tunniste voi sisältää ainoastaan kirjaimia ja numeroita."
 
 #: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
 msgid "Nothing is selected."
+msgstr "Mitään ei ole valittuna."
+
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
-msgstr ""
+msgstr "Korvaa..."
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
-msgstr ""
+msgstr "Lisää..."
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
-msgstr ""
+msgstr "Leikkaa"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
-msgstr ""
+msgstr "Kopioi"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
-msgstr ""
+msgstr "Liitä"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
-msgstr ""
+msgstr "Useammat tämän tyypin widgetit eivät ole tuettuja"
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
-msgstr ""
+msgstr "Lukitse liikkuvuus"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
-msgstr ""
+msgstr "Siirrä välilehteä vasemmalle"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
-msgstr ""
+msgstr "Siirrä välilehteä oikealle"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
-msgstr ""
+msgstr "Poista välilehti"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
-msgstr ""
+msgstr "Nimeä välilehti"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
-msgstr ""
+msgstr "Lisää uusi välilehti"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
-msgstr ""
+msgstr "Näytä sarakkeiden otsakkeet"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
-msgstr ""
+msgstr "Laajenna laatikkoa 1:llä elementillä"
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
-msgstr ""
+msgstr "Pienennä laatikkoa 1:llä elementillä"
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
-msgstr ""
+msgstr "Yhtenäinen"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
-msgstr ""
+msgstr "Laajenna"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
-msgstr ""
+msgstr "Täytä"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
+msgstr "Tee painikkeen asetukset"
+
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
 msgstr ""
 
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
-msgstr ""
+msgstr "Muokka soittolistaa"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
-msgstr ""
+msgstr "Nimeä Soittolista"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
-msgstr ""
+msgstr "Poista Soittolista"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
-msgstr ""
+msgstr "Lisää Uusi Soittolista"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
-msgstr ""
+msgstr "Soittolistaselain"
diff --git a/po/fr.po b/po/fr.po
index 96d3741..b745797 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,13 +6,15 @@
 # Olowen Cilyan <gaknar at gmail.com>, 2010
 # iceTwy <icetwy at inventati.org>, 2013
 # Olowen Cilyan <gaknar at gmail.com>, 2010
+# Superboa <superboa at hotmail.fr>, 2014
+# Superboa <superboa at hotmail.fr>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/fr/)\n"
 "Language: fr\n"
@@ -21,17 +23,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "À propos de DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Notes de version pour DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Traducteurs de DeaDBeeF"
@@ -88,44 +90,44 @@ msgstr "Pré-ampli à zéro"
 msgid "Zero Bands"
 msgstr "Bandes à zéro"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Préréglages"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 jour %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d jours %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Arrêté | %d pistes | %s de temps d'écoute total"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stéréo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "En pause | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -133,963 +135,1016 @@ msgstr ""
 "%s%s %s| %d Hz | %d bit | %s | %d:%02d / %s | %d pistes | %s de temps "
 "d'écoute total"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Nouvelle liste de lecture"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nouvelle liste de lecture (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Liste de lecture avec onglet"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Liste de lecture"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "Séparateur (haut et bas)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "Séparateur (droit et gauche)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "Onglets des listes de lecture"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Propriétés de la sélection"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Affichage de la couverture de l'album"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "Portée"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "Spectre"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Bouton"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr "Barre de lecture"
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr "Barre de volume"
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Échec à la lecture du fichier d'aide"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Échec à l'ouverture du fichier d'aide"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
+"Le lecteur est actuellement actif en tâche de fond. Si vous quittez "
+"maintenant, les tâches seront ignorées ou interrompues. Cela peut provoquer "
+"des pertes de données."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "Voulez-vous toujours quitter ?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Ouvrir un (des) fichier(s)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Ajouter un (des) fichier(s)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Ajouter un (des) dossier(s)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Ajouter un emplacement"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Nouvelle liste de lecture"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Charger une liste de lecture"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Enregistrer la liste de lecture"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "Édit_er"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Effacer"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Tout sélectionner"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Tout désélectionner"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Inverser la sélection"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Sélection"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Enlever"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Découper"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Rechercher"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Classer par"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Titre"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Numéro de piste"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Artiste"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Date"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Aléatoire"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Barre d'état"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Égaliseur"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "Mode design"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Lecture"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Ordre"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Linéaire"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Mélanger les pistes"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Mélanger les albums"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Boucler"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Tout répéter"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Répéter une seule piste"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "Ne pas répéter"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Le défilement suit la lecture"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "La sélection suit la lecture"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Arrêter après la piste actuelle"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr "Arrêter après l'album actuel"
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Passer à la prochaine piste"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Notes de version"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "À pr_opos"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Traducteurs"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Rechercher"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Stop"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Lire"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pause"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Précédent"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Suivant"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Lecture aléatoire"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "À propos"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Aide"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Propriétés de la piste"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "Location:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Paramètres"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Appliquer"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Métadonnée"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Propriétés"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Titre :"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Entrez le nom de la nouvelle colonne ici"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Type :"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Index de l'item"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Lecture"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Couverture de l'album"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Artiste - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Durée"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Numéro de Piste"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Groupe / Artiste de l'album"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Format :"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Alignement :"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Gauche"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Droite"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "A_nnuler"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_Valider"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Greffon de sortie :"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Périphérique de sortie :"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Toujours convertir l'audio 8 bits à 16 bits"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Toujours convertir l'audio 16 bits à 24 bits"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Son"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Mode du ReplayGain (ajustement du volume) :"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Désactiver"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Piste"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Ajustement des crêtes par ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Préampli Replaygain:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Préampli global:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Ajouter des fichiers à cette liste de lecture depuis la ligne de commande "
 "(ou le gestionnaire de fichier) :"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Charger la session précédente au démarrage"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Ne pas ajouter depuis des archives pendant l'ajout de dossiers"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "Automatiquement remettre \"Arrêter après la piste actuelle\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Lecture"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Configurer"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Réglage de la chaîne DSP"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Charger"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Fermer la fenêtre la réduit dans la zone de notification"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Masquer l'icône de notification"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "Activer la détection et le ré-encodage du Russe CP1251 "
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Activer la détection et le ré-encodage du Chinois CP936"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Taux de rafraîchissement de l'interface (fois par seconde):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Barre de titre en lecture :"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Barre de titre à l'arrêt :"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Plugin du GUI (tout changement nécessite un redémarrage):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
-msgstr ""
+msgstr "Lecteur"
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "fermer les listes de lecture avec le bouton du milieu de la souris"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
-msgstr ""
+msgstr "Afficher la piste courante en utilisant des caractères gras"
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
 msgstr "Masquer l'entrée \"Supprimer du disque\" du menu contextuel"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 "Nommer automatiquement les listes de lecture à l'ajout d'un seul dossier"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "Adapter automatiquement les colonnes à la fenêtre"
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "GUI/Divers"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Redéfinir"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Premier plan"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Arrière-plan"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Couleurs de la barre de lecture/échelle du volume"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Fond"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Clair"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Sombre"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Texte"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Couleur des onglets"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Redéfinir (perd le thème des listes GTK, mais accélère le rendu)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Lignes paires"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Lignes impaires"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Ligne sélectionnée"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Texte sélectionné"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Curseur"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Couleurs des listes de lecture"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Couleurs"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Activer le serveur mandataire"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Adresse du serveur mandataire :"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Port du serveur mandataire :"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Type de serveur mandataire :"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Nom d'utilisateur sur le serveur mandataire :"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Mot de passe sur le serveur mandataire :"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr "Editer le Content-Type Mapping"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Réseau"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr "Raccourcis clavier définis:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr "Action:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr "<Non défini>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr "Combinaison de touches:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "Raccourci général"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
 msgstr ""
+"Utiliser le bouton Appliquer pour sauvegarder les modifications, \n"
+"ou le bouton Rétablir pour les annuler.\n"
+"Les changements ne seront pas sauvegardés \n"
+"si vous ne cliquez pas sur Appliquer."
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
-msgstr ""
+msgstr "_Défauts"
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "Raccourcis"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Version:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Greffons"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL :"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "Grouper par..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "Classer par..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Format"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Ascendant"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Descendant"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Choisir le plugin DSP"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Greffon"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Paramètres de l'éditeur de tags"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Écrire ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Écrire ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Écrire APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Effacer ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Effacer ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Effacer APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Version ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Recommandé)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Encodage des caractères ID3v1 (iso8859-1 par défaut)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Écrire ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr "Content-Type Mapping"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
+"Cette table définit la liaison entre les types de contenu de flux réseau et "
+"les greffons du décodeur de DeaDBeeF. Par exemple, les fichiers mp3 peuvent "
+"avoir le type de contenu \"audio/x-mpeg\", et avoir besoin d'être décodé par "
+"le propre greffon \"stdmpg\" de DeaDBeeF, ou le greffon \"ffmpeg\"."
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr "Revenir aux paramètres par défaut"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr "Type de Contenu"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "Greffons:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr "Propriétés du bouton"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr "Couleur:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr "Couleur du texte:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr "Icône:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr "Étiquette"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr "Choisir une action"
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Artiste / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "N° piste"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
 msgstr "Ajouter à la file d'attente de lecture"
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
 msgstr "Enlever de la file d'attente de lecture"
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
 msgstr "Recharger les métadonnées"
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
 msgstr "Supprimer du disque"
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Ajouter une colonne"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Éditer la colonne"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Enlever la colonne"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
-msgstr ""
+msgstr "Épingler les groupes lors du défilement"
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Grouper par"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Aucun"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Artiste/Date/Album"
 
@@ -1106,19 +1161,21 @@ msgstr "Configurer %s"
 msgid "Default Audio Device"
 msgstr "Périphérique audio par défaut"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
+"Vous avez modifié les paramètres des raccourcis, mais vous n'avez pas "
+"sauvegarder les changements."
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
-msgstr ""
+msgstr "Êtes-vous sûr de vouloir continuer sans avoir sauvegardé?"
 
 #: ../plugins/gtkui/progress.c:56
 msgid "Adding files..."
 msgstr "Ajout des fichiers..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Initialisation..."
 
@@ -1131,142 +1188,142 @@ msgid "Really close the window?"
 msgstr "Fermer réellement la fenêtre ?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Plusieurs valeurs]"
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Clé"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Valeur"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[Plusieurs valeurs]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Edition des tags..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "Nom du champ"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Nom:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Les noms de champ ne doivent pas commencer par : ou _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Impossible d'ajouter le champ"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Un champ avec le même nom existe, merci d'utiliser un nom différent."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Ajouter un champ"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Enlever le champ"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "Utilisation: deadbeef [options] [--] [fichier(s)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Options :\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  ou  -h     Affiche l'aide (ce message) et quitte\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Fermer le lecteur\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Affiche les informations de version et quitte\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Démarre la lecture\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Arrête la lecture\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Suspend la lecture\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "--toggle-pause Mettre en pause\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 "--play-pause Jouer la piste si elle est arrêtée, mettre en pause sinon\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Musique suivante dans la liste de lecture\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Musique précédente dans la liste de lecture\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Musique aléatoire dans la liste de lecture\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr ""
 "   --queue            Ajoute le(s) fichier(s) dans la liste existante\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 "--gui GREFFON Indique le greffon GUI à utiliser, par défault \"GTK2\"\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Envoi le nom de la piste format  dans stdout\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1274,11 +1331,11 @@ msgid ""
 "                      copy[r]ight, [e]lapsed\n"
 msgstr ""
 "                      FMT %%-syntaxe : [a]rtiste, [t]itre, al[b]um,\n"
-"                      [l]ongueur, [n]uméro de piste, [y]année, [c]"
-"ommentaire,\n"
+"                      [l]ongueur, [n]uméro de piste, [y]année, "
+"[c]ommentaire,\n"
 "                      copy[r]ight, [e]coulé\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1287,28 +1344,24 @@ msgstr ""
 "                      ex : --nowplaying \"%%a - %%t\" affiche \"artiste - "
 "titre\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"pour plus d'informations, voir http://sourceforge.net/apps/mediawiki/"
-"deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Défaut"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Oui"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Non"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1333,7 +1386,7 @@ msgstr ""
 "Artiste du groupe / de l'album\n"
 "Personnalisé"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1341,7 +1394,7 @@ msgstr ""
 "Gauche\n"
 "Droite"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1351,7 +1404,7 @@ msgstr ""
 "Piste\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1359,7 +1412,7 @@ msgstr ""
 "Ascendant\n"
 "Descendant"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1367,14 +1420,7 @@ msgstr ""
 "2.3 (Recommandé)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Impossible de trouver le fichier pixmap : %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1387,8 +1433,8 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "Ajouter un CD audi"
+msgid "Add Audio CD"
+msgstr ""
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1547,103 +1593,105 @@ msgstr ""
 #. OSD Notify plugin
 #: ../translation/extra.c:49
 msgid "Notification title format"
-msgstr ""
+msgstr "Format de titre de notification"
 
 #: ../translation/extra.c:50
 msgid "Notification content format"
-msgstr ""
+msgstr "Format de contenu de notification"
 
 #: ../translation/extra.c:51
 msgid "Show album art"
-msgstr ""
+msgstr "Montrer la couverture de l'album"
 
 #: ../translation/extra.c:52
 msgid "Album art size (px)"
-msgstr ""
+msgstr "Taille de la couverture de l'album (px)"
 
 #. PulseAudio output plugin
 #: ../translation/extra.c:54
 msgid "PulseAudio server"
-msgstr ""
+msgstr "Serveur PulseAudio"
 
 #: ../translation/extra.c:56
 msgid "Samplerate"
-msgstr ""
+msgstr "Taux d'échantillonnage"
 
 #. SHN player plugin
 #: ../translation/extra.c:58
 msgid "Relative seek table path"
-msgstr ""
+msgstr "Chemin de table de recherche relatif"
 
 #: ../translation/extra.c:59
 msgid "Absolute seek table path"
-msgstr ""
+msgstr "Chemin de table de recherche absolu"
 
 #: ../translation/extra.c:60
 msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
+"Permuter les octets audio (basculez si tout ce que vous entendez est "
+"statique)"
 
 #. SID decoder plugin
 #: ../translation/extra.c:62
 msgid "Enable HVSC Songlength DB"
-msgstr ""
+msgstr "Activer HVSC Songlenght DB"
 
 #: ../translation/extra.c:63
 msgid "Songlengths.txt (from HVSC)"
-msgstr ""
+msgstr "Songlengths.txt (de HVSC)"
 
 #: ../translation/extra.c:64
 msgid "Bits per sample (8 or 16)"
-msgstr ""
+msgstr "Bits par échantillon (8 ou 16)"
 
 #: ../translation/extra.c:65
 msgid "Default song length (sec)"
-msgstr ""
+msgstr "Longueur de morceau par défaut (sec)"
 
 #. WildMidi player plugin
 #: ../translation/extra.c:67
 msgid "Timidity++ bank configuration file"
-msgstr ""
+msgstr "Banque de fichier de configuration Timidity++ bank"
 
 #: ../translation/extra.c:70
 msgid "Track Title"
-msgstr ""
+msgstr "Titre"
 
 #: ../translation/extra.c:71
 msgid "Performer"
-msgstr ""
+msgstr "Interprète"
 
 #: ../translation/extra.c:76
 msgid "Total Tracks"
-msgstr ""
+msgstr "Pistes totales"
 
 #: ../translation/extra.c:77
 msgid "Genre"
-msgstr ""
+msgstr "Genre"
 
 #: ../translation/extra.c:78
 msgid "Composer"
-msgstr ""
+msgstr "Compositeur"
 
 #: ../translation/extra.c:79
 msgid "Disc Number"
-msgstr ""
+msgstr "Numéro de disque"
 
 #: ../translation/extra.c:80
 msgid "Comment"
-msgstr ""
+msgstr "Commentaires"
 
 #: ../translation/extra.c:81
 msgid "Encoder / Vendor"
-msgstr ""
+msgstr "Encodeur / Vendeur"
 
 #: ../translation/extra.c:83
 msgid "Location"
-msgstr ""
+msgstr "Emplacement"
 
 #: ../translation/extra.c:84
 msgid "Subtrack Index"
-msgstr ""
+msgstr "Index de sous-piste"
 
 #: ../translation/extra.c:85
 msgid "Tag Type(s)"
@@ -1660,315 +1708,336 @@ msgstr "Codec"
 #. FFmpeg deocder plugin
 #: ../translation/extra.c:89
 msgid "File Extensions (separate with ';')"
-msgstr ""
+msgstr "Extensions de fichier (séparées par ';')"
 
 #. Converter GUI
 #: ../translation/extra.c:91
 msgid "Convert"
-msgstr ""
+msgstr "Convertir"
 
 #. Resampler (Secret Rabbit Code)
 #: ../translation/extra.c:93
 msgid "Target Samplerate"
-msgstr ""
+msgstr "Taux d'échantillonnage cible"
 
 #: ../translation/extra.c:94
 msgid "Quality / Algorithm"
-msgstr ""
+msgstr "Qualité / Algorithme"
 
 #: ../translation/extra.c:95
 msgid "Automatic Samplerate (overrides Target Samplerate)"
 msgstr ""
+"Taux d'échantillonnage automatique (ignorer le taux d'échantillonnage cible)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
 msgid "Disable gapless playback (faster scanning)"
-msgstr ""
+msgstr "Désactiver la lecture sans blanc (scan plus rapide)"
 
 #. adplug
 #: ../translation/extra.c:101
 msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr ""
+msgstr "Préférer Ken emu à Satoh (surround ne fonctionnera pas)"
 
 #: ../translation/extra.c:102
 msgid "Enable surround"
+msgstr "Activer surround"
+
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
-msgstr ""
+msgstr "Le fichier existe déjà. L'écraser?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
-msgstr ""
+msgstr "Avertissement du convertisseur"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
-msgstr ""
+msgstr "Veuillez sélectionner un encodeur"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
-msgstr ""
+msgstr "Erreur du convertisseur"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
-msgstr ""
+msgstr "Conversion en cours..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
-msgstr ""
+msgstr "Sélectionner un dossier..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
-msgstr ""
+msgstr "Échec de sauvegarde du préréglage de l'encodeur"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
+"Vérifier les permissions du dossier de préréglage, choisissez un nom "
+"différent, ou libérer de l'espace disque"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
+"Un préréglage avec le même nom existe déjà. Essayez avec un nom différent."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
-msgstr ""
+msgstr "Erreur"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
-msgstr ""
+msgstr "Ajouter un nouvel encodeur"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
-msgstr ""
+msgstr "Éditer l'encodeur"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
-msgstr ""
+msgstr "Enlever le préréglage"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
-msgstr ""
+msgstr "Cette action va supprimer le préréglage sélectionné. Êtes-vous sûr?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
-msgstr ""
+msgstr "Encodeurs"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
-msgstr ""
+msgstr "Ajouter le greffon à la chaîne DSP"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
-msgstr ""
+msgstr "Échec de sauvegarde du préréglage DSP"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
-msgstr ""
+msgstr "Nouveau préréglage DSP"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
-msgstr ""
+msgstr "Éditer le préréglage DSP"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
-msgstr ""
+msgstr "Préréglages DSP"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
-msgstr ""
+msgstr "Dossier de destination:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
-msgstr ""
+msgstr "Écrire dans le dossier source de la piste"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
-msgstr ""
+msgstr "Préserver la structure du dossier"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
-msgstr ""
+msgstr "Nom de fichier de sortie :"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
 "Extension (e.g. .mp3) will be appended automatically.\n"
 "Leave the field empty for default (%a - %t)."
 msgstr ""
+"L'extension (ex : .mp3) sera ajoutée automatiquement.\n"
+"Laissez le champ vide pour le réglage par défaut (%a - %t)"
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
-msgstr ""
+msgstr "Encodeur :"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
-msgstr ""
+msgstr "Préréglage DSP :"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
-msgstr ""
+msgstr "Nombre de fils :"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
-msgstr ""
+msgstr "Format d'échantillon de sortie :"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
-msgstr ""
+msgstr "Garder le format source"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
-msgstr ""
+msgstr "8 bits entiers signés"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
-msgstr ""
+msgstr "16 bits entiers signés"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
-msgstr ""
+msgstr "24 bits entiers signés"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
-msgstr ""
+msgstr "32 bits entiers signés"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
-msgstr ""
+msgstr "32 bits flottants"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
-msgstr ""
+msgstr "Lorsque le fichier existe :"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
-msgstr ""
+msgstr "Demander quoi faire"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
-msgstr ""
+msgstr "Écraser"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
-msgstr ""
+msgstr "Éditer le préréglage de l'encodeur"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
-msgstr ""
+msgstr "Encodeur sans nom"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
-msgstr ""
+msgstr "Extension de fichier de sortie :"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
-msgstr ""
+msgstr "Ex: mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
-msgstr ""
+msgstr "Ligne de commande :"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
 "Example: lame - %o\n"
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
+"Exemple : lame - %o\n"
+"%i pour fichier d'entrée, %o pour fichier de sortie, - pour stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
 "<small>%o - output file name\n"
 "%i - temporary input file name</small>"
 msgstr ""
+"<small>%o - nom de fichier de sortie\n"
+"%i - nom de fichier d'entrée temporaire</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
-msgstr ""
+msgstr "Méthode :"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
-msgstr ""
+msgstr "Tube"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
-msgstr ""
+msgstr "Fichier temporaire"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
-msgstr ""
+msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
-msgstr ""
+msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
-msgstr ""
+msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
-msgstr ""
+msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
-msgstr ""
+msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
-msgstr ""
+msgstr "<b>Éditeur d'étiquette</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
-msgstr ""
+msgstr "Éditeur de préréglage DSP"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
-msgstr ""
+msgstr "Préréglage DSP sans nom"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Ajouter"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Impossible de trouver le fichier pixmap : %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1978,45 +2047,55 @@ msgid ""
 "32 bit signed int\n"
 "32 bit float"
 msgstr ""
+"Garder le format source\n"
+"8 bits entiers signés\n"
+"16 bits entiers signés\n"
+"24 bits entiers signés\n"
+"32 bits entiers signés\n"
+"32 bits flottants"
 
 #: ../plugins/converter/converter.glade.h:19
 msgid ""
 "Prompt\n"
 "Overwrite"
 msgstr ""
+"Demander quoi faire\n"
+"Écraser"
 
 #: ../plugins/converter/converter.glade.h:34
 msgid ""
 "Pipe\n"
 "Temporary file"
 msgstr ""
+"Tube\n"
+"Fichier temporaire"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
-msgstr ""
+msgstr "Commandes personnalisées de l'interface"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
-msgstr ""
+msgstr "Éditer"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
-msgstr ""
+msgstr "Fermer"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
-msgstr ""
+msgstr "Éditer la commande"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
-msgstr ""
+msgstr "Commande :"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2024,176 +2103,186 @@ msgid ""
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
 msgstr ""
+"Commande d'interface arbitraire. Sera exécuté dans le contexte de "
+"l'interface de l'application principale qui a été démarrée. Le formatage de "
+"titre peut être utilisé. Exemple: xdg-open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
-msgstr ""
+msgstr " Identification :"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
-msgstr ""
+msgstr "Nom à structure libre, par exemple \"Ma commande d'interface\""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
+"Commande d'identification, devrait être normalement quelque chose de court, "
+"par exemple \"youtube_open\". Cela doit être unique."
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
-msgstr ""
+msgstr "Pistes seules"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
-msgstr ""
+msgstr "Fonctionne sur une piste seule."
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
-msgstr ""
+msgstr "Plusieurs Pistes"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
-msgstr ""
+msgstr "Fonctionne sur plusieurs pistes."
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
-msgstr ""
+msgstr "Local"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
-msgstr ""
+msgstr "Fonctionne sur des fichiers locaux."
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
-msgstr ""
+msgstr "Distant"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
-msgstr ""
+msgstr "Fonctionne sur des fichiers distants (ex : http:// streams)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "Générique (Menu Principal)"
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
-msgstr ""
+msgstr "L'objet devrait apparaître dans le menu principal "
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version.</small>"
 msgstr ""
+"<small>Si vous voulez ajouter la commande au menu principal, assurez-vous "
+"que le titre contienne le chemin de menu comme ceci: \"Fichier/Ma Commande"
+"\", où le fichier est le nom du menu dans la version anglaise.</small>"
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
-msgstr ""
+msgstr "Ajouter une commande"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
-msgstr ""
+msgstr "Supprimer"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr ""
+msgstr "Cette action va supprimer le préréglage sélectionné. Êtes-vous sûr?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
-msgstr ""
+msgstr "Confirmer la suppression"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
-msgstr ""
+msgstr "L'identification ne doit pas être vide et unique.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
-msgstr ""
+msgstr "Le titre ne doit pas être vide\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
-msgstr ""
+msgstr "La commande de l'interface ne doit pas être vide.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
-msgstr ""
+msgstr "Valeurs invalides"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
-msgstr ""
+msgstr "Formats de son supportés"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
-msgstr ""
+msgstr "Tous les fichiers (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
-msgstr ""
+msgstr "Ouvrir un (des) fichier(s)..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
-msgstr ""
+msgstr "Ajouter un (des) fichier(s) à la liste de lecture..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
-msgstr ""
+msgstr "Ajouter un (des) dossier(s) à la liste de lecture..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
-msgstr ""
+msgstr "Suivre les liens symboliques"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
-msgstr ""
+msgstr "aide.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
-msgstr ""
+msgstr "Supprimer les fichiers du disque"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
+"Les fichiers seront perdus. Procéder ?\n"
+"(Ce dialogue peut être désactivé dans les paramètres du greffon GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
-msgstr ""
+msgstr "Charger une liste de lecture"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
-msgstr ""
+msgstr "Autres fichiers (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
-msgstr ""
+msgstr "Enregistrer la liste de lecture sous"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr ""
+msgstr "Fichiers de liste de lecture DeaDBeeF (*.dbpl)"
 
 #: ../plugins/gtkui/ctmapping.c:129
 msgid "Content-Type"
-msgstr ""
+msgstr "Type de contenu"
 
 #: ../plugins/gtkui/ctmapping.c:199
 msgid "Invalid value(s)."
-msgstr ""
+msgstr "Valeur(s) invalide(s)."
 
 #: ../plugins/gtkui/ctmapping.c:200
 msgid ""
@@ -2205,107 +2294,125 @@ msgid ""
 "Content type should be only letters, numbers and '-' sign.\n"
 "Plugin id can contain only letters and numbers."
 msgstr ""
+"Les champs des greffons et type de contenu ne doivent pas être vide, et "
+"doivent respecter les règles.\n"
+"Exemple de type de contenu: 'audio/mpeg'.\n"
+"Exemple de greffon ids: 'stdmpg ffmpeg'.\n"
+"Les espaces doivent être utilisés comme des séparateurs dans la liste de "
+"greffon ids.\n"
+"Le type de contenu doit seulement être des lettres, des numéros et le signe "
+"'-'.\n"
+"Le greffon id peut seulement contenir des lettres et des numéros."
 
 #: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
 msgid "Nothing is selected."
-msgstr ""
+msgstr "Rien n'a été sélectionné"
+
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "Le gadget \"%s\" n'est pas disponible"
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
-msgstr ""
+msgstr "Remplacer par..."
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
-msgstr ""
+msgstr "Insérer..."
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
-msgstr ""
+msgstr "Couper"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
-msgstr ""
+msgstr "Copier"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
-msgstr ""
+msgstr "Coller"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
-msgstr ""
+msgstr "Plusieurs gadgets de ce type ne sont pas pris en charge"
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
-msgstr ""
+msgstr "Verrouiller tout déplacement"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
-msgstr ""
+msgstr "Déplacer l'onglet vers la gauche"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
-msgstr ""
+msgstr "Déplacer l'onglet vers la droite"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
-msgstr ""
+msgstr "Enlever l'onglet"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
-msgstr ""
+msgstr "Renommer l'onglet"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
-msgstr ""
+msgstr "Ajouter un nouvel onglet"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
-msgstr ""
+msgstr "Montrer les en-têtes de colonne"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
-msgstr ""
+msgstr "Développer la boîte par 1 objet"
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
-msgstr ""
+msgstr "Réduire la boîte par 1 objet"
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
-msgstr ""
+msgstr "Homogène"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
-msgstr ""
+msgstr "Développer"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
-msgstr ""
+msgstr "Remplir"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
-msgstr ""
+msgstr "Configurer le bouton"
+
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr "Voix :"
 
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
-msgstr ""
+msgstr "Éditer la liste de lecture"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
-msgstr ""
+msgstr "Renommer la liste de lecture"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
-msgstr ""
+msgstr "Enlever la liste de lecture"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
-msgstr ""
+msgstr "Ajouter une nouvelle liste de lecture"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
-msgstr ""
+msgstr "Navigateur de liste de lecture"
diff --git a/po/gl.po b/po/gl.po
index daf5941..4984cfd 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# antiparvos <marcoslansgarza at gmail.com>, 2013
-# mbouzada <mbouzada at gmail.com>, 2010
-# mbouzada <mbouzada at gmail.com>, 2010
+# antiparvos <marcoslansgarza at gmail.com>, 2013-2014
+# Miguel Anxo Bouzada <mbouzada at gmail.com>, 2010
+# Miguel Anxo Bouzada <mbouzada at gmail.com>, 2010,2014
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-24 17:55+0000\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:16+0000\n"
 "Last-Translator: antiparvos <marcoslansgarza at gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/gl/)\n"
@@ -21,17 +21,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Sobre DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Cambios en DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Tradutores de DeaDBeeF"
@@ -88,1009 +88,1066 @@ msgstr "Restabelecer o preamplificador"
 msgid "Zero Bands"
 msgstr "Restabelecer as bandas"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Axustes"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 día %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d días %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Detido | %d pistas | Tempo total: %s"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Pausado | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d pistas | Tempo total: %s"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Nova lista de reprodución"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nova lista de reprodución (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Listas con lapelas"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Lista de reprodución"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "Separador (arriba e abaixo)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "Separador (esquerda e dereita)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "Lapelas das listas"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Propiedades da selección"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Mostrar portadas"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "Scope"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Botón"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr "Barra de busca"
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr "Controis de reprodución"
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr "Barra de volume"
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr "Voces Chiptune"
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Produciuse un fallo ao ler o ficheiro de axuda"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Produciuse un fallo ao cargar o ficheiro de axuda"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 "O reprodutor está executando tarefas en segundo plano. Se sae agora, as "
 "tarefas cancelaranse ou interrumpiranse e é posíbel que se perdan datos."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "Aínda desexa saír?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Abrir ficheiro(s)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Engadir ficheiro(s)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Engadir cartafol(es)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Engadir localización"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Nova lista de reprodución"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Cargar a lista de reprodución"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Gardar a lista de reprodución"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Saír"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Seleccionar todo"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Desmarcar todo"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Inverter a selección"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Selección"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Retirar"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Cortar"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Buscar"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Ordenar por"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Título"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Número de pista"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Álbum"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Interprete"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Data"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Ao chou"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Ver"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Barra de estado"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Ecualizador"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "Modo deseño"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Reproducir"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Orden"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Lineal"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Barallar pistas"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Barallar álbums"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Repetir"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Repetir todas"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Repetir canción"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "Non repetir"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Desprazar á seguinte reprodución"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Punteiro na seguinte reprodución"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Deter ao rematar a pista actual"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr "Parar despois da pista actual"
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr "Deter ao rematar o álbum actual"
+
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Ir á pista actual"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Axuda"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Cambios"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Tradutores"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Buscar"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Deter"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Reproducir ao chou"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Sobre"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Saír"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Axuda"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Propiedades da pista"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "Localización:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Configuración"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Título:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Escriba aquí o novo título da columna"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Índice de elementos"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Reproducindo"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Portada"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Interprete - Álbum"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Duración"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Pista numero"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Banda / Interprete do álbum"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Aliñamento"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Dereita"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Engadido de saída:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Dispositivo de saída:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Converter sempre o son de 8 bits a 16 bits"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Converter sempre o son de 16 bits a 24 bits"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Son"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Modo de normalización de volume"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Pista"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Escala de límite de normalización de volume"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Normalización de volume do preamplificador:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Preamplificación global:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Engadir ficheiros desde a liña de ordes (ou xestor de ficheiros) a esta "
 "lista de reprodución:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Continuar a sesión anterior no inicio"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Non engadir desde ficheiros cando se engaden cartafoles"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "Restaurar automaticamente «Deter ao rematar a pista actual»"
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+"A opción «Parar despois da pista actual» desactivarase despois da acción"
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+"A opción «Parar despois do álbum actual» desactivarase despois da acción"
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Reprodución"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Configurar"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Cadeas DSP predefinidas"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Cargar"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Pechar minimizado na área de notificación"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Agochar a icona da área de notificación"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "Activar detección e recodificacón do SHIFT-JIS xaponés"
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "Activar a detección e recodificación do Ruso CP1251"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Activar a detección e recodificación do Chinés CP936"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Frecuencia de actualización da interface (veces por segundo):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Texto da barra de título cando se reproduce:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Texto da barra de título cando está detido:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Engadido de interface de usuario (require reiniciar):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr "Reprodutor"
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr "Pechar as listas de reprodución co botón central do rato"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr "Resaltar a pista en reprodución usando tipografía grosa."
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Agochar o elemento «Eliminar do disco» do menú contextual "
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr "Agochar o elemento «Eliminar do disco» do menú contextual"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 "Nomear automaticamente as listas de reprodución ao engadir un só cartafol"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr "Adaptar as columnas para que se axusten a xanela"
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "GUI/Misc"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Anular"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Fronte"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Fondo"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Cores das barras de busca/volume"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Medio"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Claro"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Escuro"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Texto"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Cores das lapelas"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Cambiar (ignora o tema GTK, mais acelera o debuxado)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Fila par"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Fila impar"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Fila seleccionada"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Texto seleccionado"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Cursor"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Cores da lista de reprodución"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Cores"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Activar o servidor proxy"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Enderezo do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Porto do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Tipo de proxy:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Nome de usuario do proxy:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Contrasinal do proxy:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "Axente do usuario HTTP:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr "Editar a asignación do tipo de contido"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Rede"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr "Teclas rápidas asignadas:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr "Acción:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr "<Sen estabelecer>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr "Combinación de teclas:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "Tecla rápida global"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
 msgstr ""
+"Use o botón «Aplicar» para gardar os cambios\n"
+"ou o botón «Reverter» para desfacelos.\n"
+"Os cambios NON se gardarán se non\n"
+"preme «Aplicar»."
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr "_Predeterminados"
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "Teclas rápidas"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Versión: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Dereitos de autor"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Engadidos"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr "Estabelecer título personalizado"
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "Agrupar por..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "Ordenar por..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Formato"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Descendente"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Escolla o engadido DSP"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Engadido"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Configuración do editor de etiquetas"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Escribir ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Escribir ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Escribir APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Eliminar ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Eliminar ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Eliminar APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Versión de ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (recomendado)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Codificación de caracteres de ID3v1 (por omisión é iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Escribir ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr "Asignación do tipo de contido"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
+"Esta táboa define as asignacións entre os tipos de contido de fluxos de rede "
+"e os engadidos decodificadores de DeaDBeeF. Por exemplo, os ficheiros mp3 "
+"poden ter un tipo de contido «audio/x-mpeg» e precisan decodificarse polos "
+"engadidos propios de DeaDBeeF stdmpg ou ffmpeg."
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr "Restabelecer predeterminados"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr "Tipo de contido:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "Engadidos:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr "Propiedades do boton"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr "Cor:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr "Cor do texto:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr "Icona:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr "Etiqueta:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr "Seleccionar acción"
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+"Este diálogo permite personalizar o título de calquera pista. Moi útil para "
+"emisoras de radio. Tamén hai unha opción para personalizar os títulos no "
+"diálogo «Engadir localización». O título verase nas columnas que mostran o "
+"campo dos metadatos do «Artista». Aparecerá como [personalización] artista "
+"se se mostra o campo Artista ou só «personalización» en caso contrario."
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Interprete / Álbum"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Pista num."
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Engadir na cola de reprodución"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr "Engadir á cola de reprodución"
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Retirar da cola de reprodución"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr "Eliminar da cola de reprodución"
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
 msgstr "Recargar os metadatos"
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Retirar do disco"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr "Eliminar do disco"
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Engadir columna"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Editar columna"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Retirar columna"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr "Fixar os grupos ao desprazarse"
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Agrupar por"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Ningún"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Interprete/Data/Álbum"
 
@@ -1107,11 +1164,11 @@ msgstr "Configurar %s"
 msgid "Default Audio Device"
 msgstr "Dispositivo de son predeterminado"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr "Modificou os axustes das teclas rápidas pero non gardou os cambios."
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr "Desexa continuar sen gardar?"
 
@@ -1119,7 +1176,7 @@ msgstr "Desexa continuar sen gardar?"
 msgid "Adding files..."
 msgstr "Engadindo ficheiros,,,"
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Iniciando..."
 
@@ -1132,104 +1189,104 @@ msgid "Really close the window?"
 msgstr "Ten certeza de que quere pechas esta xanela?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Valores múltiples] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Tecla"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Valor"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[Varios valores]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Escribindo etiquetas"
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "Nome do campo"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Os nomes dos campos non deben comezar con «:» ou «_»"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Non é posíbel engadir o campo"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Xa existe un campo con este nome, tente con outro diferente."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Engadir campo"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Retirar campo"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 "Uso: deadbeef [opcións] [--] [ficheiro(s)]\n"
 "\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Opcións:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  ou  -h     Amosar a axuda (esta mensaxe) e saír\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Pechar o reprodutor\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Amosar a versión e saír\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Iniciar a reprodución\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Deter a reprodución\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Pausar a reprodución\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Inverter a pausa\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1237,28 +1294,28 @@ msgstr ""
 "   --play-pause       Iniciar a reprodución se se detén, ou pola contra "
 "inverter a pausa\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Seguinte canción da lista de reprodución\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Canción anterior da lista de reprodución\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Canción ao chou da lista de reprodución\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr ""
 "   --queue            Engadir ficheiro(s) á lista de reprodución existente\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
@@ -1267,12 +1324,12 @@ msgstr ""
 "predeterminado é «GTK2»\n"
 "\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Amosar o nome da pista formatado por stdout\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1283,7 +1340,7 @@ msgstr ""
 "                      l: Duración, n: Pista, y: Ano, c: Comentario,\n"
 "                      r: Copyright, e: Tempo restante\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1292,28 +1349,24 @@ msgstr ""
 "                      e.g.: --nowplaying «%%a - %%t» amosaría: «interprete - "
 "título»\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
-msgstr ""
-"                      para obter máis información, vexa http://sourceforge."
-"net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
+msgstr "para obter máis información, vexa %s\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Si"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Non"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1339,7 +1392,7 @@ msgstr ""
 "Banda / Intreprete do álbum\n"
 "Personalizado"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1347,7 +1400,7 @@ msgstr ""
 "Esquerda\n"
 "Dereita"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1357,7 +1410,7 @@ msgstr ""
 "Pista\n"
 "Álbum"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1365,7 +1418,7 @@ msgstr ""
 "Ascendente\n"
 "Descendente"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1373,14 +1426,7 @@ msgstr ""
 "2.3 (recomendado)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Non se atopou o ficheiro de imaxe: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1393,7 +1439,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr "Engadir CD de son"
 
 #: ../translation/extra.c:4
@@ -1687,7 +1733,7 @@ msgstr "Mostraxe automática (sobrescribe o destinos das mostraxes)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr "Configurar ordes por terminal personalizadas"
 
 #. mpgmad
@@ -1704,35 +1750,40 @@ msgstr "Preferir Ken emu a Satoh (o son envolvente non funcionará)"
 msgid "Enable surround"
 msgstr "Activar son envolvente"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr "[Integrado] %s"
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Este ficheiro xa existe. Quere sobrescribilo?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Aviso do convertedor"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Escolla o codificador"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Produciuse un erro no convertedor"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Convertendo"
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Seleccionar cartafol"
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Produciuse un fallo ao gardar os axustes do codificador"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1740,77 +1791,77 @@ msgstr ""
 "Comprobe os permisos predeterminados do cartafol, tente escoller outro "
 "título, ou liberar algo de espazo no disco"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "Xa existe un axuste con este título. Tente escoller outro título."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Erro"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Engadir un novo codificador"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Editar o codificador"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Retirar o axuste"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Esta acción elimina o axuste seleccionado. Está vostede seguro?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Codificadores"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Engadir un «engadido» á cadea DSP"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Non foi posíbel gardar o axuste DSP"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Novo axuste DSP"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Editar o axuste DSP"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "Axustes DSP"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Cartafol de saída:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr "Escribir no cartafol da pista de orixe"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr "Conservar a estrutura do cartafol"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Nome do ficheiro de saída:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1820,89 +1871,89 @@ msgstr ""
 "A extensión (p.ex. mp3) engadirase automaticamente.\n"
 "Deixar o campo baleiro de xeito predeterminado (%a -%t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Codificador"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "Axuste DSP"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Número de fíos:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Formato da mostra de saída"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Manter o formato da orixe"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 bit asinados int"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 bit asinados int"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 bit asinados int"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 bit asinados int"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 bit flotantes"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Cando o ficheiro xa existe:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Preguntar"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Sobrescribir"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Editar os axustes do codificador"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Codificador sen título"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Extensión do ficheiro de saída:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "P.ex. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Liña de ordes:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1913,7 +1964,7 @@ msgstr ""
 "%i para o ficheiro de entrada, %o para o ficheiro de saída, - para a entrada "
 "estándar"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1923,66 +1974,72 @@ msgstr ""
 "<small>%o - nome do ficheiro de saída\n"
 "%i - nome do ficheiro temporal de entrada</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Método:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Canalización"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Ficheiro temporal"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Escritor de etiquetas</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "Editor de axustes DSP"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Axuste DSP sen título"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Engadir"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Non se atopou o ficheiro de imaxe: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2020,27 +2077,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr "Ordes por terminal personalizadas"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "Editar"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "Pechar"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "Editar orde"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "Orde:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2052,17 +2109,17 @@ msgstr ""
 "iniciou o aplicativo principal. Pode usarse o formatado do título. Exemplo: "
 "xdg-open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "ID:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr "Nome en forma libre, por exemplo «A miña orde por terminal»"
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
@@ -2071,57 +2128,57 @@ msgstr ""
 "ID da orde, normalmente debe ser curto, por exempolo «abrir_youtube». Debe "
 "ser único."
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr "Pistas únicas"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "Funciona cunha pista única."
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "Múltiples pistas"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "Funciona con múltiples pistas."
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "Local"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "Funciona con ficheiros locais."
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr "Remoto"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr "Funciona con ficheiros remotos  (p.e. http:// streams)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr "Xenérico (menú principal)"
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "O elemento debería aparecer no menú principal"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2132,73 +2189,73 @@ msgstr ""
 "contén o camiño ao menú deste xeito: \"Ficheiro/A_miña_orde\", onde "
 "«Ficheiro» é o nome do menú na versión en inglés.</small>"
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Engadir orde"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 "Esta acción elimina a orde de terminal seleccionada. Está vostede seguro?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr "Confirmar a eliminación"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr "O ID non pode quedar baleiro e debe ser único.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr "O título non pode quedar baleiro.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr "A orde por terminal non pode quedar baleira.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "Valores incorrectos"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr "Formatos compatíbeis de son"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "Todos os ficheiros (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr "Abrir ficheiro(s)..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr "Engadir ficheiro(s) á lista..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr "Engadir cartafol(es) á lista..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr "Seguir ligazóns simbólicas"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr "axuda.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "Eliminar os ficheiros do disco"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -2206,19 +2263,19 @@ msgstr ""
 "Perderanse os ficheiros. Continuar?\n"
 "(Este diálogo pode desactivarse nos axustes do engadido GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "Cargar lista de reprodución"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "Outros ficheiros (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr "Gardar a lista como"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Ficheiros de listas de reprodución e DeaDBeeF (*.dbpl)"
 
@@ -2240,107 +2297,123 @@ msgid ""
 "Content type should be only letters, numbers and '-' sign.\n"
 "Plugin id can contain only letters and numbers."
 msgstr ""
+"Os campos do tipo de contido e dos engadidos non poden quedar baleiros e "
+"deben cumprir as regras.\n"
+"Exemplo de tipo de contido: «audio/mpeg».\n"
+"Exemplo de tipo de contido: «stdmpg ffmpeg».\n"
+"Os espazos deben usarse como separadores na lista de ID dos engadidos.\n"
+"O tipo de contido só debe levar letras, números e o signo «-».\n"
+"O ID do engadido só debe levar letras e números."
 
 #: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
 msgid "Nothing is selected."
 msgstr "Non se seleccionou nada."
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "O miniaplicativo «%s» non está dispoñíbel"
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr "Substituír con..."
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr "Inserir..."
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr "Cortar"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr "Pegar"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr "Múltiples miniaplicativos deste tipo non son compatíbeis"
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr "Movemento de bloqueo"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr "Mover lapela á esquerda"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr "Mover lapela á dereita"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr "Eliminar lapela"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr "Renomear lapela"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr "Engadir nova lapela"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr "Amosar as cabeceiras das columnas"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr "Expandir a caixa 1 elemento"
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr "Encoller a caixa 1 elemento"
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr "Homoxéneo"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr "Expandir"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr "Encher"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr "Configurar botón"
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr "Voces:"
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr "Editar a lista"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr "Renomear a lista"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr "Eliminar a lista"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr "Engadir un lista de reprodución"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr "Nome"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr "Explorador de listas de reprodución"
diff --git a/po/he.po b/po/he.po
index c27a23d..c2537ef 100644
--- a/po/he.po
+++ b/po/he.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Yaron Shahrabani <sh.yaron at gmail.com>, 2010,2013
+# Yaron Shahrabani <sh.yaron at gmail.com>, 2010,2013-2014
 # Yaron Shahrabani <sh.yaron at gmail.com>, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-08-02 09:39+0000\n"
+"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/he/)\n"
 "Language: he\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "על אודות DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "יומן השינויים של DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "מתרגמי DeaDBeeF"
@@ -87,44 +87,44 @@ msgstr "איפוס מגבר קדם"
 msgid "Zero Bands"
 msgstr "איפוס הערוצים"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "תצורות"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "יום אחד %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d ימים %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "נעצר | %d רצועות | %s סך כל זמן הנגינה"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "מונו"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "סטריאו"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d קסל״ש "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "מושהה |"
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -132,745 +132,772 @@ msgstr ""
 "%s%s %s| %d הרץ | %d סיביות | %s | %d:%02d / %s | %d רצועות | %s סך כל זמן "
 "הנגינה"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "רשימת השמעה חדשה"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "רשימת השמעה חדשה (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "רשימת השמעה עם לשוניות"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "רשימת השמעה"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "חוצץ (למעלה ולמטה)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "חוצץ (שמאלה וימינה)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "לשוניות רשימות השמעה"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "מאפייני הבחירה"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "הצגת עטיפת אלבום"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "טווח"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "ספקטרום"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "לחצן"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr "פקדי נגינה"
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr "פס עצמת השמע"
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "אירע כשל במהלך קריאת קובץ העזרה"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "אירע כשל בטעינת קובץ העזרה"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "האם אכן ברצונך לצאת?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_קובץ"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_פתיחת קובץ/ים"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "הוספת קובץ/ים"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "הוספת תיקייה/ות"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "הוספת מיקום"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "רשימת השמעה חדשה"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "טעינת רשימת השמעה"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "שמירת רשימת השמעה"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "י_ציאה"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "ע_ריכה"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_מחיקה"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "בחירת הכל"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "ביטול בחירת הכול"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "הפיכת הבחירה"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "בחירה"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "הסרה"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "חיתוך"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_חיפוש"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "סידור לפי"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "כותרת"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "מספר הרצועה"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "אלבום"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "אומן"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "תאריך"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "אקראי"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "מותאם אישית"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "העדפות"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_תצוגה"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "שורת מצב"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "אקוולייזר"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "מצב עיצוב"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "ה_שמעה"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "סדר"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "קווי"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "ערבול בין הרצועות"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "ערבול בין האלבומים"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "נגינה בלולאה"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "לולאה על הכול"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "לולאה על שיר אחד"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "ללא לולאה"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "הגלילה עוקבת אחר ההשמעה"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "הסמן עוקב אחר ההשמעה"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "עצירה לאחר הנוכחי"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "מעבר לרצועה הנוכחית"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "ע_זרה"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "יומן _שינויים"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "על _אודות"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "מ_תרגמים"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "עצירה"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "נגינה"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "השהיה"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "הקודם"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "הבא"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "נגינה אקראית"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "על אודות"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "יציאה"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "עזרה"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "מאפייני הרצועה"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "מיקום:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "הגדרות"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "ה_חלה"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_סגירה"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "נתוני על"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "מאפיינים"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "כותרת:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "יש להזין את הכותרת החדשה כאן"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "סוג:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "אינדקס הפריט"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "מתנגן"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "עטיפת האלבום"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "אומן – אלבום"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "משך"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "רצועה מספר"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "להקה / אומן האלבום"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "מבנה:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "יישור:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "שמאל"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "ימין"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_אישור"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "תוסף פלט:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "התקן הפלט:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "תמיד להמיר שמע של 8 סיביות ל־16 סיביות"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "שמע"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "מצב הגברת נגינה חוזרת:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "לא פעיל"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "רצועה"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "מידת הגברת הנגינה החוזרת"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "הגברת נגינה חוזרת:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "הגברת נגינה כללית:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "הוספת קבצים משורת הפקודה (או ממנהל הקבצים) לרשימת ההשמעה:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "המשך ההפעלה הקודמת עם התחלת התכנית"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "אין להוסיף מארכיונים בעת הוספת תיקיות"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "השמעה"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "הגדרה"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "תצורת שרשרת DSP"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_טעינה"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "סגירה ממזערת לאזור המערכת"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "הסתרת הסמל באזור הדיווחים"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "הפעלה של זיהוי וקידוד מחדש של רוסית בתקן CP1251"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "הפעלה של זיהוי וקידוד מחדש של סינית בתקן CP936"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "קצב רענון המנשק (פעמים בשנייה):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "טקסט הכותרת בעת ההשמעה:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "טקסט הכותרת בעת עצירה:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "תוסף מנשק משתמש (שינויים דורשים הפעלה מחדש):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "הסתרת פריט ההקשר \"מחיקה מהכונן\""
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "מתן שם אוטומטית לרשימות השמעה בעת הוספת תיקייה בודדת"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
-msgstr ""
+msgstr "מנשק/שונות"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "דריסה"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "קידמה"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "רקע"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "צבעי פס גלילת ההשמעה/פס עוצמת השמע"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "בינוני"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "בהיר"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "כהה"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "בסיסי"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "טקסט"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "צבעי ראשי הלשוניות"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "דריסה (רכיבי העיצוב של ה־GTK יאבדו אך העיבוד יהיה מהיר יותר)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "שורה זוגית"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "שורה אי־זוגית"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "שורה נבחרת"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "טקסט שנבחר"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "סמן"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "צבעי רשימת ההשמעה"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "צבעים"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "הפעלת שרת מתווך"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "כתובת שרת התיווך:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "פתחת שרת התיווך:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "סוג שרת התיווך:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "שם המשתמש במתווך:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "הססמה במתווך:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "סוכן משתמש HTTP:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "רשת"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
-msgstr ""
+msgstr "מקשי קיצור מוקצים:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
-msgstr ""
+msgstr "פעולה:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
-msgstr ""
+msgstr "צירוף מקשים:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -878,122 +905,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
-msgstr ""
+msgstr "_בררות מחדל"
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
-msgstr ""
+msgstr "מקשי קיצור"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "גרסה:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "זכויות יוצרים"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "תוספים"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "כתובת:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "קיבוץ לפי …"
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "סידור לפי …"
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "מבנה"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "סדר עולה"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "סדר יורד"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "בחירת תוסף DSP"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "תוסף"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "הגדרות כותב התגיות"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "כתיבת ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "כתיבת ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "כתיבת APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "הסרת ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "הסרת ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "הסרת APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "גרסת ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (מומלץ)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "קידוד התווים של ID3v1 (בררת המחדל היא iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "כתיבת ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1001,91 +1034,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "תוספים:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
-msgstr ""
+msgstr "צבע:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
-msgstr ""
+msgstr "צבע הטקסט:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
-msgstr ""
+msgstr "סמל:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
-msgstr ""
+msgstr "תווית:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
+msgstr "בחירת פעולה"
+
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "אומן / אלבום"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "רצועה מספר"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "הוספה לתור ההשמעה"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "הסרה מתור ההשמעה"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "טעינת נתוני העל מחדש"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "הסרה מהכונן"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "הוספת עמודה"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "עריכת עמודה"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "הסרת עמודה"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "קיבוץ לפי"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "ללא"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "אומן/תאריך/אלבום"
 
@@ -1102,11 +1144,11 @@ msgstr "הגדרת %s"
 msgid "Default Audio Device"
 msgstr "התקן השמע כברירת מחדל"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1114,7 +1156,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "מתבצעת הוספת קבצים..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "בהפעלה..."
 
@@ -1127,141 +1169,141 @@ msgid "Really close the window?"
 msgstr "האם באמת לסגור את החלון?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[ערכים מרובים]"
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "מפתח"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "ערך"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[ריבוי ערכים]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "התגיות נכתבות..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "שם השדה"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "שם:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "שמות השדות לא יכולים להתחיל בתווים : או _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "לא ניתן להוסיף שדה"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "שדה בשם זה כבר קיים, נא לנסות שם אחר."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "הוספת שדה"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "הסרת שדה"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "Usage: deadbeef [options] [--] [file(s)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Options:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  or  -h     Print help (this message) and exit\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Quit player\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Print version info and exit\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Start playback\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Stop playback\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Pause playback\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Toggle pause\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Next song in playlist\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Previous song in playlist\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Random song in playlist\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Append file(s) to existing playlist\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Print formatted track name to stdout\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1272,7 +1314,7 @@ msgstr ""
 "                      [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 "                      copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1281,28 +1323,24 @@ msgstr ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "בררת מחדל"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "כן"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "לא"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1328,7 +1366,7 @@ msgstr ""
 "להקה / אמן האלבום\n"
 "מותאם אישית"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1336,7 +1374,7 @@ msgstr ""
 "שמאל\n"
 "ימין"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1346,7 +1384,7 @@ msgstr ""
 "רצועה\n"
 "אלבום"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1354,7 +1392,7 @@ msgstr ""
 "סדר עולה\n"
 "סדר יורד"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1362,14 +1400,7 @@ msgstr ""
 "2.3 (מומלץ)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "לא ניתן למצוא את קובץ ה־pixmap:‏ %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1381,8 +1412,8 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "הוספת תקליטור שמע"
+msgid "Add Audio CD"
+msgstr ""
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1674,7 +1705,7 @@ msgstr "קצב דגימה אוטומטי (דורס את קצב דגימת היע
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1691,35 +1722,40 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "הקובץ כבר קיים. האם לשכתב?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "אזהרה מהממיר"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "נא לבחור מצפין"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "שגיאת ממיר"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "בהמרה..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "בחירת תיקייה..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "אירע כשל בשמירת ערכת ההצפנה"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1727,77 +1763,77 @@ msgstr ""
 "נא לבדוק את הרשאות תיקיית התצורות, יש לנסות לבחור בכותרת אחרת או לפנות קצת "
 "מקום בכונן"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "תצורה באותו השם כבר קיימת. נא לנסות לבחור בשם אחר."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "שגיאה"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "הוספת מצפין חדש"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "עריכת מצפין"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "הסרת תצורה"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "הפעולה תמחק את התצורה הנבחרת. האם לעשות זאת?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "מצפינים"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "הוספת התוסף לשרשרת ה־DSP"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "שמירת תצורת ה־DSP נכשלה"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "תצורת DSP חדשה"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "עריכת תצורת DSP"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "תצורות DSP"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "תיקיית הפלט:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr "שימור מבנה התיקיות"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "שם קובץ הפלט:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1807,89 +1843,89 @@ msgstr ""
 "סיומות (לדוגמה: .mp3) יתווספו אוטומטית.\n"
 "יש להשאיר את השדה ריק לקבלת שם בררת המחדל ‎(%a - %t)‎."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "מצפין:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "תצורת DSP:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "מספר התהליכים:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "מבנה דגימת הפלט:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "שמירה על מבנה המקור"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "מספר שלם עם סימן ב־8 סיביות"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "מספר שלם עם סימן ב־16 סיביות"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "מספר שלם עם סימן ב־24 סיביות"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "מספר שלם עם סימן ב־32 סיביות"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "מספר עם נקודה צפה ב־32 סיביות"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "כאשר הקובץ קיים:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "הצגת בקשה"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "שכתוב"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "עריכת תצורת המצפין"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "מצפין ללא שם"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "סיומת קובץ הפלט:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "לדוגמה: mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "שורת הפקודה:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1899,7 +1935,7 @@ msgstr ""
 "לדוגמה: lame - %o\n"
 "%i לציון קובץ קלט, %o לציון קובץ קלט, - עבור הקלט מ־stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1909,66 +1945,72 @@ msgstr ""
 "<small>%o - שם קובץ הפלט\n"
 "%i - השם הזמני לקובץ הקלט</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "שיטה:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "שרשור"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "קובץ זמני"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>כותב תגיות</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "ערוך תצורות DSP"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "תצורת DSP ללא שם"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "הוספה"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "לא ניתן למצוא את קובץ ה־pixmap:‏ %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2006,27 +2048,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "עריכה"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "סגירה"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "עריכת הפקודה"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "פקודה:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2035,74 +2077,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "מזהה:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr "שם חופשי, למשל „פקודת המעטפת שלי“"
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "הפריט אמור להופיע בתפריט הראשי"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2110,90 +2152,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "הוספת פקודה"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "מחיקה"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
-msgstr ""
+msgstr "אישור הסרה"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "ערכים שגויים"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "כל הקבצים (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "מחיקת קבצים מהכונן"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "טעינת רשימת השמעה"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "קבצים אחרים (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
-msgstr ""
+msgstr "שמירת רשימת ההשמעה בשם"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2220,102 +2262,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr "לא נבחר כלום"
 
-#: ../plugins/gtkui/widgets.c:594
-msgid "Replace with..."
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:772
+msgid "Replace with..."
+msgstr "החלפה ב…"
+
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
-msgstr ""
+msgstr "הוספה…"
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
-msgstr ""
+msgstr "גזירה"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
-msgstr ""
+msgstr "העתקה"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
-msgstr ""
+msgstr "הדבקה"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
-msgstr ""
+msgstr "נעילת תנועה"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
-msgstr ""
+msgstr "העברת הלשונית שמאלה"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
-msgstr ""
+msgstr "העברת הלשונית ימינה"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
-msgstr ""
+msgstr "הסרת לשונית"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
-msgstr ""
+msgstr "שינוי שם הלשונית"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
-msgstr ""
+msgstr "הוספת לשונית חדשה"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
-msgstr ""
+msgstr "הצגת כותרות העמודות"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
-msgstr ""
+msgstr "הרחבה"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
-msgstr ""
+msgstr "מילוי"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
-msgstr ""
+msgstr "הגדרת לחצן"
+
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr "קולות:"
 
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
-msgstr ""
+msgstr "עריכת רשימת השמעה"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
-msgstr ""
+msgstr "שינוי שם רשימת ההשמעה"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
-msgstr ""
+msgstr "הסרת רשימת השמעה"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
-msgstr ""
+msgstr "הוספת רשימת השמעה חדשה"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
-msgstr ""
+msgstr "שם"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
-msgstr ""
+msgstr "סייר רשימות השמעה"
diff --git a/po/hr.po b/po/hr.po
index aff7ccd..87c0a1f 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/hr/)\n"
 "Language: hr\n"
@@ -21,17 +21,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "O DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF prevoditelji"
@@ -88,44 +88,44 @@ msgstr ""
 msgid "Zero Bands"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Unaprijed postavljeno"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dan %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dana %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Zustavljeno | %d zapisi| %s ukupno vrijeme sviranja"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Pauzirano | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -133,747 +133,774 @@ msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d zapisi | %s ukupno vrijeme "
 "sviranja"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Nova lista izvođenja"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nova lista izvođenja (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Neuspjeh tijekom čitanja datoteke pomoći"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Neuspjeh u učitavanju datoteke pomoći"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Otvori datoteku(e)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Dodaj datoteku(e)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Dodaj mapu(e)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Dodaj lokaciju"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Nova lista izvođenja"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Učitaj listu izvođenja"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Spremi listu izvođenja"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Iskjluči"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Očisti"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Odaberi sve"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Poništi odabrano"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Obrnuti odabir"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Odabir"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Ukloni"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Nađi"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Naslov"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Broj zapisa"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Umjetnik"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Datum"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Nasumično"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Prolagođeno"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Svojstva"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Statusna traka"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Ujednačivač"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Reprodukcija"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Redoslijed"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Linearni"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Klizač slijedi reprodukciju"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Pokazivač slijedi reprodukciju"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Stop nakon trenutne"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Skoči na trenutni zapis"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_O programu"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Traži"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Stop"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Sviraj"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Prethodno"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Slijedeće"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Sviraj nasumično"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "O programu"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Isključi"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Pomoć"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Svojstva zapisa"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Postavke"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Primjeni"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Svojstva"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Naslov:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Unesi naziv novog stupca"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Tip:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr ""
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Svira"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Album Umjetnik"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Umjetnik _ album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Trajanje"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Broj zapisa"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Grupa / album umjetnik"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Poravnanje:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Lijevo"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Desno"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Izlazni priključak:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Izlazni uređaj:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Uvijek pretvori 8 bit audio u 16 bit"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Onemogući"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Zapis"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Dodaj datoteke iz naredbanog retka (ili upravljača datotekama) na uvu listu "
 "izvođenja:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Reprodukcija"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Konfiguriraj"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Učitaj"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Tekst naslovne trake dok svira:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Tekst naslovne trake kad je zaustavljeno:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Pozadina"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Srednje"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Svijetlo"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Tamno"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Tekst"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Odabrani red"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Odabrani tekst"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Pokazivač"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Boje liste izvođenja"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Boje"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Omogući proxy poslužitelj"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Adresa proxy poslužitelja:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Port proxy poslužitelja:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Vrsta proxy-a:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Proxy korisničko ime:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Proxy lozinka:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Mreža"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -881,122 +908,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Verzija: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Autorska prava"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Priključci"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Format"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Odaberi DSP priključak"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Priključak"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Piši ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Piši ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Piši APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 verzija"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (preporučeno)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1004,91 +1037,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Umjetnik / album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Broj zapisa"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Ukloni sa diska"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Dodaj stupac"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Uredi stupac"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Ukloni stupac"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Grupiraj po"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Ništa"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Umjetnik/datum/album"
 
@@ -1105,11 +1147,11 @@ msgstr "Konfiguriraj %s"
 msgid "Default Audio Device"
 msgstr "Zadani audio uređaj"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1117,7 +1159,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Dodavanje datoteka..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr ""
 
@@ -1130,139 +1172,139 @@ msgid "Really close the window?"
 msgstr "Stvarno zatvoriti prozor?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Vrijednost"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Ime:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Imena polja ne smiju započinjati sa : ili _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Ne mogu dodati polje"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Polje sa tim imenom već postoji,molim pokušajte s drugim imenom."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Dodaj polje"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Ukloni polje"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Opcije:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  or  -h    Ispisuje pomoć (ova poruka) i izlazi\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Isključi svirač\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Ispis info verzije i izlaz\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Početak reprodukcije\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Zaustavlja reprodukciju\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Zaustavlja reprodukciju\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Slijedaća pjesma na listi izvođenja\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Prethodna pjesma na listi izvođenja\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           nasumična pjesma na listi izvođenja\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr ""
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1270,7 +1312,7 @@ msgid ""
 "                      copy[r]ight, [e]lapsed\n"
 msgstr ""
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1279,26 +1321,24 @@ msgstr ""
 "                      e.g.: sada svira \"%%a - %%t\" treba ispisati "
 "\"umjetnik - naslov\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Zadano"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Da"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Ne"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1324,7 +1364,7 @@ msgstr ""
 "Grupa / Album Umjetnik\n"
 "Prilagođeno"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1332,20 +1372,20 @@ msgstr ""
 "LIjevo\n"
 "Desno"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
 "Album"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1353,14 +1393,7 @@ msgstr ""
 "2.3 (Preporučeno)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1370,7 +1403,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1663,7 +1696,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1680,111 +1713,116 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Odaberi mapu..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Greška"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Ukloni unaprijed postavljeno"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP unaprijed postavljeno"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Izlazna mapa:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Ime izlazne datoteke:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1792,89 +1830,89 @@ msgid ""
 "Leave the field empty for default (%a - %t)."
 msgstr ""
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP unaprijed postavljeno:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr ""
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr ""
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Proširenje izlazne datoteke:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Naredbeni redak:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1882,7 +1920,7 @@ msgid ""
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1890,66 +1928,72 @@ msgid ""
 "%i - temporary input file name</small>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Metoda:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Privremena datoteka"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr ""
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Dodaj"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1977,27 +2021,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2006,74 +2050,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2081,90 +2125,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2191,102 +2235,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index bde0589..5e41dbd 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# Péter Polonkai <polesz at nedudu.hu>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/deadbeef-"
 "player/language/hu/)\n"
 "Language: hu\n"
@@ -18,17 +19,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "DeaDBeeF %s névjegye"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s Változás napló"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF Fordítók"
@@ -85,44 +86,44 @@ msgstr "Preamp nulla"
 msgid "Zero Bands"
 msgstr "Sávok nulla"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
-msgstr ""
+msgstr "Hangszínek"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 nap %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d nap %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Megállítva | %d sáv | %s teljes lejátszási idő"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Monó"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Sztereó"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Szünet |"
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -130,870 +131,907 @@ msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d sáv | %s teljes lejátszási "
 "idő"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Új lejátszólista"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Új lejátszólista (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
-msgstr ""
+msgstr "Lejátszólista fülekkel"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
-msgstr ""
+msgstr "Lejátszólista"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
-msgstr ""
+msgstr "Szétosztás (felső és alsó)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
-msgstr ""
+msgstr "Szétosztás (bal és jobb)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
-msgstr ""
+msgstr "Lejátszólista fülek"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
-msgstr ""
+msgstr "Kiválasztás tulajdonságai"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
-msgstr ""
+msgstr "Album borító kijelző"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
-msgstr ""
+msgstr "Szkóp"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
-msgstr ""
+msgstr "Spektrum"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
-msgstr ""
+msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
-msgstr ""
+msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
+msgstr "Gomb"
+
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr "Léptető sáv"
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr "Lejátszó vezérlők"
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr "Hangerő sáv"
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Súgó fájl olvasása sikertelen"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Súgó fájl betöltése sikertelen"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
-msgstr ""
+msgstr "Még mindig kiszeretne lépni?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Figyelemeztetés"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Fájl"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Fájl(ok) megnyitása"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Fájl(ok) hozzáadása"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Könyvtár(ak) hozzáadása"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Hely hozzáadása"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Új lejátszólista"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Lejátszólista betöltése"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Lejátszólista mentése"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "Sz_erkesztés"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Törlés"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Mind kiválaszt"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Minden kiválasztást megszüntet"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Kiválasztás megfordítása"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Választás"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Vágás"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Keresés"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
-msgstr ""
+msgstr "Rendezés"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Cím"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Zeneszám száma"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Előadó"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Dátum"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Véletlenszerű"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Egyéb"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Nézet"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Státusz sor"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Hangszínszabályzó"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
-msgstr ""
+msgstr "Tervező mód"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Lejátszás"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Sorrend"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Lineáris"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Számok keverése"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Albumok keverése"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Ismétlés"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
-msgstr ""
+msgstr "Mindet ismétli"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
-msgstr ""
+msgstr "Egyetlen dal ismétlése"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
-msgstr ""
+msgstr "Nincs ismétlés"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "A lapozás követi a lejátszást"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "A kurzor követi a lejátszást"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Az aktuális szám után megállít"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Ugrás az aktuális számra"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Változás napló"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "Fordí_tók"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Keresés"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Megállítás"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Lejátszás"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Szünet"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Előző"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Következő"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Véletlenszerű lejátszás"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Névjegy"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Kilépés"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Súgó"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "A sáv tulajdonságai"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
-msgstr ""
+msgstr "Hely:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Beállítások"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Alkalmaz"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Bezár"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metaadat"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Cím:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Adja meg a fejléc új címét"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Típus"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Elem index"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Lejátszás"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Album kép"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Előadó - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Időtartam"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Sáv száma"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Zenekar / Album előadó"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Formátum"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Igazítás"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Balra"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Jobbra"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Mégsem"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Kimeneti bővítmény:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Kimeneti eszköz:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "A 8 bites audiót mindig konvertálja át 16 bitessé"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
-msgstr ""
+msgstr "Mindig konvertálja a 16 bites audiót 24 bitre"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Hang"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Újrajátszási mód:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Letiltva"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Sáv"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Újrajátszási csúcs skála"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Újrajátszás előerősítése:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Általanos előerősítés:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Fájlok hozzáadása parancssorból (vagy fájl kezelőből) a lejátszólistához"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Előző állapot helyreállítása indításkor"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Ne adja hozzá az archívumok tartalmát mappák hozzáadásakor"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Lejátszás"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Beállítás"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Betöltés"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Bezáráskor a tálcára kerül"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Rendszertálca ikon elrejtése"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
+msgid "Enable Russian CP1251 detection and recoding"
+msgstr "Orosz CP1251 karakterkészlet detektálás és újrakódolás engedélyezése"
+
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
-msgstr ""
+msgstr "Kínai CP936 karakterkészlet detektálás és újrakódolás engedélyezése"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Felhasználói felület képfrissítési rátája ( / mp ):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Címsáv szöveg szám lejátszásakor:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Címsáv szöveg ha nincs lejátszás:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "GUI beépülő (újraindítás szükséges):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
-msgstr ""
+msgstr "Lejátszó"
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Lejátszólista bezárása középső egér gombbal"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
-msgstr ""
+msgstr "Az éppen játszott dal félkövér betűtípussal"
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Elrejti a \"Törlés a lemezről\" menü elemet"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Lejátszási listák automatikus elnevezése egyetlen mappa hozzáadásakor"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "Oszlopok automatikus átméretezése az ablak kitöltéséhez"
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
-msgstr ""
+msgstr "GUI/Egyéb"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Felülírás"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Előtér"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Háttér"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Idősáv/Hangerő színek"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Közép"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Világos"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Sötét"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Alap"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Szöveg"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Fülek színe"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Felülírás (elveszti a GTK treeview témát, de gyorsul a rajzolás sebessége)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Páros sor"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Páratlan sor"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Kiválasztott sor"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Kiválasztott szöveg"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Kurzor"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Lejátszólista színek"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Színek"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Proxy szerver engedélyezése"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Proxy szerver cím:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Proxy szerver port:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Proxy típusa:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Proxy felhasználónév:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Proxy jelszó:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
-msgstr ""
+msgstr "HTTP Felhasználó azonosító:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Hálózat"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
-msgstr ""
+msgstr "Hozzárendelt gyorsbillentyűk:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
-msgstr ""
+msgstr "Akció:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
-msgstr ""
+msgstr "<Nincs beállítva>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
-msgstr ""
+msgstr "Billentyű kombináció:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
-msgstr ""
+msgstr "Globális billentyűk"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
 msgstr ""
+"Használd az Alkalmaz gombot a változások mentéséhez,\n"
+"vagy a Visszavonás gombot a változások elvetéséhez.\n"
+"A változások NEM lesznek mentve\n"
+"amíg nem nyomja meg az Alkalmaz gombot."
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
-msgstr ""
+msgstr "_Alapértelmezett"
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
-msgstr ""
+msgstr "Billentyűk"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Verzió:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Bővítmények"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr "Egyedi Cím megadása"
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
-msgstr ""
+msgstr "Csoportosítás ..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
-msgstr ""
+msgstr "Rendezés ..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Formátum"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Növekvő"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Csökkenő"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "DSP beépülő kiválasztása"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Beépülő"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Címkeíró beállításai"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "ID3v2 írása"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "ID3v1 írása"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "APEv2 írása"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "ID3v2 vágása"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "ID3v1 vágása"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "APEv2 vágása"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 verzió"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Ajánlott)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v2 karakter kódolás (alapértelmezés iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 írása"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1001,91 +1039,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
-msgstr ""
+msgstr "Alapértékekre állít"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
-msgstr ""
+msgstr "Bővítmények:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
-msgstr ""
+msgstr "Gombok beállítása"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
-msgstr ""
+msgstr "Szín:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
-msgstr ""
+msgstr "Szöveg szín:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
-msgstr ""
+msgstr "Ikon:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
-msgstr ""
+msgstr "Címke:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
+msgstr "Válassz műveletet"
+
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Előadó / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Sáv száma"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Hozzáadás a lejátszási sorhoz"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr "Lejátszólista várakozósorhoz adás"
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Törlés a lejátszási sorból"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr "Lejátszólista várakozósorból törlés"
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Metaadat újratöltése"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr "Metaadatok újratöltése"
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
 msgstr "Törlés a lemezről"
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Oszlop hozzáadása"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Oszlop szerkesztése"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Öszlop törlése"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Csoport"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Nincs"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Előadó/Dátum/Album"
 
@@ -1102,19 +1149,19 @@ msgstr "%s beállítása"
 msgid "Default Audio Device"
 msgstr "Alapértelmezett Audio Eszköz"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
-msgstr ""
+msgstr "Valóban szeretné folytatni mentés nélkül?"
 
 #: ../plugins/gtkui/progress.c:56
 msgid "Adding files..."
 msgstr "Fájlok hzzáadása..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Inicializálás..."
 
@@ -1127,141 +1174,141 @@ msgid "Really close the window?"
 msgstr "Valóban bezárja az ablakot?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
-msgstr ""
+msgstr "[Többszörös értékek]"
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Billentyű"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Érték"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
-msgstr ""
+msgstr "[Többszörös értékek]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Címkék írása..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
-msgstr ""
+msgstr "Mező neve"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Név:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "A szövegmezők tartalma nem kezdődhet kettősponttal vagy aláhúzásjellel"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Mező hozzáadása sikertelen"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 "Egy azonos névvel rendelkező mező már létezik, adj meg egy másik nevet."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Mező hozzáadása"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Mező eltávolítása"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
-msgstr ""
+msgstr "Használat: deadbeef [opciók] [--] [fájl(ok)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Opciók:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  vagy  -h     Súgó megjelenítése (ez az üzenet) és kilépt\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Kilépés a lejátszóból\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Verzió információ megjelenítése és kilépés\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Lejátszás indítása\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Lejátszás megállítása\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Lejátszás szüneteltetése\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Lejátszás/Szüneteltetés\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 "   --play-pause       Lejátszás indítása, lejátszás közben szüneteltetés\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Ugrás a következő számra a lejátszólistában\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Ugrás az előző számra a lejátszólistában\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Véletlenszerű szám a lejátszólistáról\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Fájl(ok) hozzáadása a létező lejátszólistához\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Szám nevének formázott kiírása az stdout-ra\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1272,7 +1319,7 @@ msgstr ""
 "                      [l]hossz, [n]sávszáma, [y]év, [c]megjegyzés,\n"
 "                      copy[r]ight, [e]ltelt idő\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1281,28 +1328,24 @@ msgstr ""
 "                      pl.: --nowplaying \"%%a - %%t\" kiírása kerül \"előadó "
 "- cím\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      további információ: http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Igen"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Nem"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1328,7 +1371,7 @@ msgstr ""
 "Zenekar / Album Előadó\n"
 "Egyéb"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1336,7 +1379,7 @@ msgstr ""
 "Balra\n"
 "Jobbra"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1346,7 +1389,7 @@ msgstr ""
 "Sáv\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1354,7 +1397,7 @@ msgstr ""
 "Növekvő\n"
 "Csökkenő"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1362,14 +1405,7 @@ msgstr ""
 "2.3 (Ajánlott)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Nem található a képfájl: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1382,7 +1418,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1434,7 +1470,7 @@ msgstr ""
 #. OSS output plugin
 #: ../translation/extra.c:18
 msgid "Device file"
-msgstr ""
+msgstr "Eszköz fájl"
 
 #: ../translation/extra.c:19
 msgid "OSS4 samplerate bug workaround"
@@ -1501,7 +1537,7 @@ msgstr "Újramintavételezés minősége (0..2, a nagyobb a jobb)"
 
 #: ../translation/extra.c:37
 msgid "8-bit output (default is 16)"
-msgstr ""
+msgstr "8-bites kimenet (alapértelmezett 16)"
 
 #. Game_Music_Emu decoder plugin
 #: ../translation/extra.c:39
@@ -1510,7 +1546,7 @@ msgstr "Maximális szám hossz (percben)"
 
 #: ../translation/extra.c:40
 msgid "Fadeout length (seconds)"
-msgstr ""
+msgstr "Elhalkítás hossza (másodperc)"
 
 #: ../translation/extra.c:41
 msgid "Play loops nr. of times (if available)"
@@ -1544,7 +1580,7 @@ msgstr "Értesítés címének formátuma"
 
 #: ../translation/extra.c:50
 msgid "Notification content format"
-msgstr ""
+msgstr "Értesítési tartalom formátuma"
 
 #: ../translation/extra.c:51
 msgid "Show album art"
@@ -1591,7 +1627,7 @@ msgstr "Bitek száma mintánként (8 / 16)"
 
 #: ../translation/extra.c:65
 msgid "Default song length (sec)"
-msgstr ""
+msgstr "Alapértelmezett dal hossz (mp)"
 
 #. WildMidi player plugin
 #: ../translation/extra.c:67
@@ -1667,7 +1703,7 @@ msgstr "Cél mintavételezési rátája"
 
 #: ../translation/extra.c:94
 msgid "Quality / Algorithm"
-msgstr ""
+msgstr "Minőség / Algoritmus"
 
 #: ../translation/extra.c:95
 msgid "Automatic Samplerate (overrides Target Samplerate)"
@@ -1675,13 +1711,13 @@ msgstr "Automatikus mintavételezi ráta (minden beállítást felülír)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
 msgid "Disable gapless playback (faster scanning)"
-msgstr ""
+msgstr "Szünetmentes (gapless) lejátszás tiltása (gyorsabb keresés)"
 
 #. adplug
 #: ../translation/extra.c:101
@@ -1690,278 +1726,295 @@ msgstr ""
 
 #: ../translation/extra.c:102
 msgid "Enable surround"
-msgstr ""
+msgstr "Surround engedélyezése"
+
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr "[Beépített] %s"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Azonos nevű fájl már létezik. Felülírjam?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Konvertálási figyelmeztetés"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Kérlek, válassz egy enkódert"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Konvertálási hiba"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Konvertálás..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Mappa kiválasztása..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Hiba"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Új enkóder hozzáadása"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Enkóder szerkesztése"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Mentett hangszín törlése"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
-msgstr ""
+msgstr "Kódolók"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr ""
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
-msgstr ""
+msgstr "Kimeneti könyvtár:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
-msgstr ""
+msgstr "Írás a dal forrás könyvtárába"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
-msgstr ""
+msgstr "Mappa struktúra megtartása"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
-msgstr ""
+msgstr "Kimeneti fájlnév:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
 "Extension (e.g. .mp3) will be appended automatically.\n"
 "Leave the field empty for default (%a - %t)."
 msgstr ""
+"A kiterjesztés (pl: .mp3) automatikusan hozzáadódi.\n"
+"Hagy üresen a mezőt az alapértelmezéshez (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
-msgstr ""
+msgstr "Kódoló:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
-msgstr ""
+msgstr "Szálak száma:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
-msgstr ""
+msgstr "Kimeneti minta formátuma:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
-msgstr ""
+msgstr "Forrás formátum megtartása"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
-msgstr ""
+msgstr "32 bit lebegőpontos"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
-msgstr ""
+msgstr "Ha a fájl létezik:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
-msgstr ""
+msgstr "Kérdés"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
-msgstr ""
+msgstr "Felülírás"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
-msgstr ""
+msgstr "Névtelen kódoló"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
-msgstr ""
+msgstr "Kimeneti fájl kiterjesztése:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
-msgstr ""
+msgstr "Például: mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
-msgstr ""
+msgstr "Parancssor:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
 "Example: lame - %o\n"
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
+"Példa: lame - %o\n"
+"%i bemeneti fájlnév, %o kimeneti fájlnév, - stdin használata"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
 "<small>%o - output file name\n"
 "%i - temporary input file name</small>"
 msgstr ""
+"<small>%o - kimeneti fájlnév\n"
+"%i - átmeneti bemeneti fájlnév</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
-msgstr ""
+msgstr "Metódus:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
-msgstr ""
+msgstr "Cső"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
-msgstr ""
+msgstr "Átmeneti fájl"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
-msgstr ""
+msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
-msgstr ""
+msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
-msgstr ""
+msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
-msgstr ""
+msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
-msgstr ""
+msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
-msgstr ""
+msgstr "<b>Címkeíró</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr ""
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Hozzáadés"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nem található a képfájl: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1977,39 +2030,43 @@ msgid ""
 "Prompt\n"
 "Overwrite"
 msgstr ""
+"Kérdés\n"
+"Felülírás"
 
 #: ../plugins/converter/converter.glade.h:34
 msgid ""
 "Pipe\n"
 "Temporary file"
 msgstr ""
+"Cső\n"
+"Átmeneti fájl"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
-msgstr ""
+msgstr "Egyedi héjparancsok"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
-msgstr ""
+msgstr "Szerkeszt"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
-msgstr ""
+msgstr "Bezár"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
-msgstr ""
+msgstr "Szerkesztő parancs"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
-msgstr ""
+msgstr "Parancs:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2018,74 +2075,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
-msgstr ""
+msgstr "ID:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
-msgstr ""
+msgstr "Egyedi számok"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
-msgstr ""
+msgstr "Csak egy dalnál működik."
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
-msgstr ""
+msgstr "Többszörös Sávok"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
-msgstr ""
+msgstr "Működik többszörös sávokon is."
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
-msgstr ""
+msgstr "Helyi"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
-msgstr ""
+msgstr "Munka csak helyi fájlokkal"
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
-msgstr ""
+msgstr "Távoli"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
-msgstr ""
+msgstr "Munka csak távoli fájlokkal (például: http:// folyamok)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "Általános (Főmenü)"
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2093,92 +2150,94 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
-msgstr ""
+msgstr "Parancs hozzáadása"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
-msgstr ""
+msgstr "Törlés"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr ""
+msgstr "Ez törli a kiválasztott héj parancsot. Valóban akarja?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
-msgstr ""
+msgstr "Törlés jóváhagyva"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
-msgstr ""
+msgstr "ID nem lehet üres vagy egyedi\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
-msgstr ""
+msgstr "Cím nem lehet üres.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
-msgstr ""
+msgstr "Héjparancs nem lehet üres.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
-msgstr ""
+msgstr "Érvénytelen érték"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
-msgstr ""
+msgstr "Támogatott hangformátumok"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
-msgstr ""
+msgstr "Minden fájl (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
-msgstr ""
+msgstr "Fájlok megnyitása..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
-msgstr ""
+msgstr "Fájlok hozzáadása a lejátszólistához..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
-msgstr ""
+msgstr "Mappák hozzáadása a lejátszólistához..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
-msgstr ""
+msgstr "Szimbolikus linkek követése"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
-msgstr ""
+msgstr "help.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
-msgstr ""
+msgstr "Fájlok törlése a diszkről"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
+"A fájlok el fognak veszi. Folytatja?\n"
+"(Ez a párbeszéd ablak kikapcsolható a GTKUI bővítmény beállításaiban)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
-msgstr ""
+msgstr "Lejátszólista betöltése"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
-msgstr ""
+msgstr "Egyéb fájlok (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
-msgstr ""
+msgstr "Lejátszólista mentése másként"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr ""
+msgstr "DeadBeeF lejátszólista fájlok (*.dbpl)"
 
 #: ../plugins/gtkui/ctmapping.c:129
 msgid "Content-Type"
@@ -2186,7 +2245,7 @@ msgstr ""
 
 #: ../plugins/gtkui/ctmapping.c:199
 msgid "Invalid value(s)."
-msgstr ""
+msgstr "Érvénytelen érték(ek)."
 
 #: ../plugins/gtkui/ctmapping.c:200
 msgid ""
@@ -2201,104 +2260,113 @@ msgstr ""
 
 #: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
 msgid "Nothing is selected."
+msgstr "Semmi nincs kiválasztva."
+
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
-msgstr ""
+msgstr "Csere erre..."
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
-msgstr ""
+msgstr "Beszúrás..."
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
-msgstr ""
+msgstr "Kivág"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
-msgstr ""
+msgstr "Másol"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
-msgstr ""
+msgstr "Beilleszt"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
-msgstr ""
+msgstr "Mozgatás megakadályozása"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
-msgstr ""
+msgstr "Fül mozgatása balra"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
-msgstr ""
+msgstr "Fül mozgatása jobbra"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
-msgstr ""
+msgstr "Fül törlése"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
-msgstr ""
+msgstr "Fül átnevezése"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
-msgstr ""
+msgstr "Új fül hozzáadása"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
-msgstr ""
+msgstr "Oszlop fejlécek mutatása"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
-msgstr ""
+msgstr "Homogén"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
-msgstr ""
+msgstr "Kiterjesztés"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
-msgstr ""
+msgstr "Kitöltés"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
-msgstr ""
+msgstr "Gombok beállítása"
+
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr "Hangok:"
 
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
-msgstr ""
+msgstr "Lejátszólista szerkesztése"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
-msgstr ""
+msgstr "Lejátszólista átnevezése"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
-msgstr ""
+msgstr "Lejátszólista törlése"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
-msgstr ""
+msgstr "Új lejátszólista hozzáadása"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
-msgstr ""
+msgstr "Név"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
-msgstr ""
+msgstr "Lejátszólista böngésző"
diff --git a/po/id.po b/po/id.po
index 4db6869..34d7213 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/deadbeef-"
 "player/language/id/)\n"
 "Language: id\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Tentang DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "ChangeLog DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Penerjemah DeaDBeeF"
@@ -86,794 +86,818 @@ msgstr "Nolkan Preamp"
 msgid "Zero Bands"
 msgstr "Zero Bands"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Preset"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 hari %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d hari %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Berhenti | %d trek | %s waktu putar total"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Jeda | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d trek | %s waktu putar total"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Daftar Putar Baru"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Daftar Putar Baru (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Daftar putar dengan tab"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Daftar putar"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "Pembelah (atas dan bawah)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "Pembelah (kiri dan kanan)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "Tab daftar putar"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Properti pilihan"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Tampilan seni album"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Tombol"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Gagal saat membaca berkas bantuan"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Gagal memuat berkas bantuan"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
-"Pemutar sedang menjalankan tugas latar belakang. Bila Anda keluar sekarang, "
-"tugas-tugas itu akan dibatalkan atau diputus. Ini bisa menyebabkan "
-"kehilangan data."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "Anda masih ingin keluar?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Peringatan"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Berkas"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Buka berkas"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Tambah berkas"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Tambah folder"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Tambah lokasi"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Daftar putar baru"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Muat daftar putar"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Simpan daftar putar"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Bersihkan"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Pilih semua"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Pilih tak satupun"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Balik pilihan"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Pilihan"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Buang"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Crop"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Cari"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Urut menurut"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Judul"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Nomor trek"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Artis"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Tanggal"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Acak"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Ubahan"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Preferensi"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Tilik"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Bilah status"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "Mode rancangan"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Putar"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Urutan"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Linier"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Acak trek"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Acak album"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Perulangan"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Ulang semua"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Ulang satu lagu"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "Jangan ulangi"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Gulir berikut pemutaran"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Kursor berikut pemutaran"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Berhenti setelah ini"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Lompat ke trek kini"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "Ba_ntuan"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_ChangeLog"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "Tent_ang"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Penerjemah"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Cari"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Berhenti"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Putar"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Jeda"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Selanjutnya"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Putar Acak"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Tentang"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Properti Trek"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "Lokasi:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Pengaturan"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "Ter_apkan"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Tutup"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Properti"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Judul:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Masukkan judul kolom baru disini"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Jenis:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Indeks Butir"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Memutar"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Album Seni"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Artis - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Durasi"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Nomor Trek"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Band / Artis Album"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Perataan:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Kiri"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Kanan"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Keluaran plugin:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Perangkat keluaran:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Selalu konversikan audio 8 bit ke 16 bit"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Suara"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Mode replaygain:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Matikan"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Trek"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Skala puncak replaygain"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Replaygain preamp:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Preamp global:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Tambahkan berkas dari baris perintah (atau manajer berkas) ke daftar putar "
 "ini:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Lanjutkan sesi sebelumnya pada awal mula"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Jangan tambahkan dari arsip ketika menambahkan folder"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Tata"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Preset Rantai DSP"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Muat"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Menutup meminimalkan ke baki"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Sembunyikan ikon baki sistem"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "Fungsikan deteksi dan pengodean ulang CP1251 Rusia"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Fungsikan deteksi dan pengodean ulang CP936 Cina"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Laju penyegaran antar muka (berapa kali per detik):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Teks bilah judul ketika memutar:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Teks bilah judul ketika berhenti:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Plugin GUI (mengubah perlu memulai ulang):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Sembunyikan butir menu konteks \"Hapus dari disk\""
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Namai otomatis daftar putar ketika menambahkan sebuah folder"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "GUI/Rupa-rupa"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Timpa"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Latar depan"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Latar belakang"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Warna bilah loncat/volume"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Tengah"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Terang"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Gelap"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Basis"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Teks"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Warna strip tab"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Timpa (kehilangan tilikan pohon GTK, tapi mempercepat perenderan)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Baris genap"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Baris ganjil"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Baris yang dipilih"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Teks yang dipilih"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Kursor"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Warna daftar putar"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Warna"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Aktifkan Server Proksi"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Alamat Server Proksi:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Port Server Proksi:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Jenis Proksi:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Nama Pengguna Proksi:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Sandi Proksi:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr "Sunting Pemetaan Content-Type (tipe isi)"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Jaringan"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr "<Tak ditata>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "Tombol pintas global"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -881,122 +905,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "Tombol pintas"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Versi:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Hak cipta"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Plugin"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "Kelompokkan Menurut ..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "Urutkan menurut ..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Format"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Naik"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Turun"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Pilih Plugin DSP"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Pengaturan Penulis Tag"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Tulis ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Tulis ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Tulis APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Hapus ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Hapus ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Hapus APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Versi ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Disarankan)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Pengodean karakter ID3v1 (bawaan adalah iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Tulis ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr "Pemetaan Content-Type"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1004,91 +1034,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr "Reset ke nilai bawaan"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr "Content-Type:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "Plugin:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Artis / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "No Trek"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Tambahkan ke antrian daftar putar"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Hapus dari antrian putar"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Muat ulang metadata"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Hapus dari disk"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Tambah kolom"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Sunting kolom"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Hapus kolom"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Kelompokkan berdasarkan"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Tak ada"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Artis/Tanggal/Album"
 
@@ -1105,11 +1144,11 @@ msgstr "Tata %s"
 msgid "Default Audio Device"
 msgstr "Perangkat Suara Bawaan"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1117,7 +1156,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Menambah berkas..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Menginisialisasi..."
 
@@ -1130,102 +1169,102 @@ msgid "Really close the window?"
 msgstr "Yakin akan menutup jendela?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Nilai berganda]"
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Kunci"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Nilai"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[Nilai berganda]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Menulis tag..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "Nama ruas"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Nama:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Nama ruas tak boleh diawali dengan : atau _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Tak bisa menambah ruas"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Ruas dengan nama itu sudah ada, harap coba nama lain."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Tambah ruas"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Hapus ruas"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "Cara pakai: deadbeef [opsi] [--] [berkas]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Opsi:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  or  -h     Cetak bantuan (pesan ini) dan keluar\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Keluar dari pemutar\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Cetak info versi dan keluar\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Mulai memutar\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Berhenti memutar\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Jeda memutar\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Jungkitkan jeda\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1233,39 +1272,39 @@ msgstr ""
 "   --play-pause       Mulai memutar bila berhenti, jungkitkan jeda bila "
 "tidak\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Lagu selanjutnya di daftar putar\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Lagu sebelumnya di daftar putar\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Acak lagu di daftar main\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr ""
 "   --queue            Tambahkan berkas ke daftar putar yang telah ada\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1273,33 +1312,31 @@ msgid ""
 "                      copy[r]ight, [e]lapsed\n"
 msgstr ""
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr ""
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Bawaan"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Ya"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Tidak"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1314,7 +1351,7 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1322,7 +1359,7 @@ msgstr ""
 "Kiri\n"
 "Kanan"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1332,7 +1369,7 @@ msgstr ""
 "Trek\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1340,7 +1377,7 @@ msgstr ""
 "Naik\n"
 "Turun"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1348,14 +1385,7 @@ msgstr ""
 "2.3 (Disarankan)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Tak bisa temukan berkas pixmap: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1365,8 +1395,8 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "Tambahkan CD audio"
+msgid "Add Audio CD"
+msgstr ""
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1658,8 +1688,8 @@ msgstr "Laju Cuplik Otomatis (menimpa Laju Cuplik Target)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
-msgstr "Tata perintah shell gubahan"
+msgid "Configure Custom Shell Commands"
+msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
@@ -1675,111 +1705,116 @@ msgstr "Lebih suka emu Ken daripada Satoh (surround tak akan bekerja)"
 msgid "Enable surround"
 msgstr "Fungsikan surround"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Berkas telah ada. Timpa?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Peringatan pengonversi"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Harap pilih enkoder"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Kesalahan pengonversi"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Mengonversi..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Pilih folder..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Gagal menyimpan preset enkoder"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Kesalahan"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Tambahkan enkoder baru"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Sunting enkoder"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Hapus preset"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Enkoder"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr ""
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1787,89 +1822,89 @@ msgid ""
 "Leave the field empty for default (%a - %t)."
 msgstr ""
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 bit signed int"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 bit signed int"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 bit signed int"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 bit signed int"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 bit float"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Tanya"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Timpa"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Mis. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1877,7 +1912,7 @@ msgid ""
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1885,66 +1920,72 @@ msgid ""
 "%i - temporary input file name</small>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Metoda:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Pipe"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Berkas temporer"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Penulis tag</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "Penyunting Preset DSP"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Preset DSP Tanpa Judul"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Tambah"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Tak bisa temukan berkas pixmap: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1972,27 +2013,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "Sunting"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "Tutup"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "Perintah Sunting"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "Perintah:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2001,74 +2042,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "ID:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2076,72 +2117,72 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "Hapus"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "Aksi ini akan menghapus perintah shell yang dipilih. Anda yakin?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr "Konfirmasi Hapus"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "Nilai Tak Valid"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr "Format suara yang didukung"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "Semua berkas (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr "Buka berkas..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr "Tambahkan berkas ke daftar putar..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr "Tambahkan folder ke daftar putar..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr "Ikuti symlink"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "Hapus berkas dari disk"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -2149,19 +2190,19 @@ msgstr ""
 "Berkas akan hilang. Lanjut?\n"
 "(Dialog ini dapat dimatikan dalam pengaturan plugin GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "Muat Daftar Putar"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "Berkas lain (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr "Simpan Daftar Putar Sebagai"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Berkas daftar putar DeaDBeeF (*.dbpl)"
 
@@ -2188,102 +2229,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr "Tak ada yang dipilih."
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 7112b97..9c7b087 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/it/)\n"
 "Language: it\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "A proposito di DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeadBeeF %s Changelog"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr ""
@@ -85,789 +85,816 @@ msgstr "Pre-ampl a zero"
 msgid "Zero Bands"
 msgstr "Bande a zero"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 giorno %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d giorni %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Stop | %d tracce | %s tempo totale"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps"
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Pausa |"
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracce | %s tempo totale"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Nuova playlist"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nuova Playlist (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Fallita la lettura del file di aiuto"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Fallito il caricamento del file di aiuto"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Attenzione"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_File"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Apri file"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Aggiungi file"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Aggiungi cartella/e"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Aggiungi locazione"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Nuova playlist"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Carica playlist"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Salva playlist"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Pulisci"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Seleziona tutto"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Deseleziona tutto"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Inverti selezione"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Selezione"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Raccolte"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Cerca"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Titolo"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Artista"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Casuale"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Personalizza"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Barra di stato"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Equalizzatore"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Riproduzione"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Ordina"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Lineare"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Looping"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Scorri seguente riproduzione"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "La selezione segue la riproduzione"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Stop finita la canzone"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Changelog"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_About"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Cerca"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Stop"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Riproduci"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Precedente"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Prossima"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Riproduzione casuale"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "About"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Esci"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Proprietà traccia"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Applica"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Proprietà"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Titolo:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Inserisci nuovo titolo colonna qui"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr ""
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Riproduzione"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Album Art"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Artista - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Durata"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Band / Album Artista"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Allineamento:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Sinistra"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Destra"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "A_nnulla"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Plugin d'uscita:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Dispositivo d'uscita:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Suono"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Modalità ripetizione:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Disabilita"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Traccia"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Modalità di ReplayGain (volume regolabile)"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "Aggiungi files da linea di comando (o file manager) a questa playlist:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Riprendi sessione precedente all'avvio"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Riproduzione"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Configura"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Chiudi minimizza nel vassoio di sistema"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Nasconde l'icona nel vassoio di sistema"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Testo della titlebar mentre riproduce:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Testo della titlebar quando fermata:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Nascondi \"Cancella dal disco\" dal menù contestuale"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Sovrascrivere"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Primo piano"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Di fondo"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Colori della Seekbar/Barra del volume"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Centrale"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Chiaro"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Scuro"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Testo"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Colore delle schede"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Sovrascrivi (perdita del tema GTK ma rendering più veloce)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Righe pari"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Righe dispari"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Riga selezionata"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Testo selezionato"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Cursore"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Colori della playlist"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Colori"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Abilita il server proxy"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Indirizzo del server proxy:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Porta del server proxy:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Tipo proxy:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Nome utente del proxy:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Password del proxy"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Rete"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -875,122 +902,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Scrivi ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Scrivi ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Scrivi APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Strip ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Strip ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Strip APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Versione ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (raccomandato)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 codifica caratteri (predefinito iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Scrivi ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -998,91 +1031,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Artista / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Traccia N°"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Aggiungi alla coda di riproduzione"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Rimuovi dalla coda di riproduzione"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Ricarica metadati"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Rimuovi dal disco"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Aggiungi colonna"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Modifica colonna"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Rimuovi colonna"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Raggruppamento"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Nessuno"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Artista/Data/Album"
 
@@ -1099,11 +1141,11 @@ msgstr ""
 msgid "Default Audio Device"
 msgstr "Dispositivo audio predefinito"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1111,7 +1153,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Sto aggiungendo i files..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Inizializzazione..."
 
@@ -1124,140 +1166,140 @@ msgid "Really close the window?"
 msgstr "Vuoi davvero chiudere la finestra?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Tasti"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Valore"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr ""
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Opzioni:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  or  -h     Stampa l'aiuto ed esce\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Esce dal player\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Stampa la versione ed esce\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Inizia la riproduzione\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Ferma la riproduzione\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Pausa nella riproduzione\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Canzone successiva nella playlist\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Canzone precedente nella playlist\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random             Canzone casuale nella playlist\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue             Aggiunge file(s) ad una playlist esistente\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 "   --nowplaying FMT   Stampa il nome della traccia formattato in stdout\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1268,7 +1310,7 @@ msgstr ""
 "                      [l]unghezza, traccia[n]umero, [y]anno, [c]ommento,\n"
 "                      copy[r]ight, [e]trascorso\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1277,26 +1319,24 @@ msgstr ""
 "                      es: --nowplaying \"%%a - %%t\" dovrebbe stampare "
 "\"artista - titolo\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Sì"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "No"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1311,7 +1351,7 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1319,7 +1359,7 @@ msgstr ""
 "Sinistra\n"
 "Destra"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1329,13 +1369,13 @@ msgstr ""
 "Traccia\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1343,14 +1383,7 @@ msgstr ""
 "2.3 (raccomandato)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "File pixmap non trovato: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1363,7 +1396,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1656,7 +1689,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1673,111 +1706,116 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr ""
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1785,89 +1823,89 @@ msgid ""
 "Leave the field empty for default (%a - %t)."
 msgstr ""
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr ""
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr ""
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1875,7 +1913,7 @@ msgid ""
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1883,66 +1921,72 @@ msgid ""
 "%i - temporary input file name</small>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr ""
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr ""
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr ""
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Aggiungi"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "File pixmap non trovato: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1970,27 +2014,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -1999,74 +2043,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2074,90 +2118,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2184,102 +2228,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 70d5b4d..1cfeab3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# hirkmt <hirkmt at gmail.com>, 2010,2014
+# hirkmt <hirkmt at gmail.com>, 2010,2014
 # Hironao Komatsu <hironao at users.sourceforge.net>, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/ja/)\n"
 "Language: ja\n"
@@ -19,17 +21,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "DeaDBeeF %s について"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s の更新履歴"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF の翻訳者"
@@ -86,1007 +88,1056 @@ msgstr "プリアンプをゼロに"
 msgid "Zero Bands"
 msgstr "バンドをゼロに"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "プリセット"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 日 %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d 日 %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "停止 | %d トラック | %s 合計演奏時間"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "ポーズ | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d トラック | %s 合計演奏時間"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "新規プレイリスト"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "新規プレイリスト (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
-msgstr ""
+msgstr "タブのついたプレイリスト"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "プレイリスト"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
-msgstr ""
+msgstr "上下分割"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
-msgstr ""
+msgstr "左右分割"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
-msgstr ""
+msgstr "プレイリストのタブ"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
-msgstr ""
+msgstr "選択のプロパティ"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
-msgstr ""
+msgstr "アルバムアートの表示"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
-msgstr ""
+msgstr "スコープ"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
-msgstr ""
+msgstr "スペクトラム"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
-msgstr ""
+msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
-msgstr ""
+msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
+msgstr "ボタン"
+
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "ヘルプファイルの読み込み中に失敗しました"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "ヘルプファイルの読み込みに失敗しました"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
-msgstr ""
+msgstr "それでも終了しますか?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "警告"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "ファイルを開く(_O)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "ファイルを追加"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "フォルダを追加"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "場所を追加"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "新規プレイリスト"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "プレイリストをロード"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "プレイリストを保存"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "クリア(_C)"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "すべて選択"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "すべて選択解除"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "選択の反転"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "選択"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "取り除く"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "選択以外を取り除く"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "検索(_F)"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
-msgstr ""
+msgstr "...で並び替え"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "タイトル"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "トラック番号"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "アルバム"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "アーティスト"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "日付"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "ランダム"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "カスタム"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "設定"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "ステータスバー"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "イコライザ"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
-msgstr ""
+msgstr "デザインモード"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "再生(_P)"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "演奏順"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "順に"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "トラックをシャッフル"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "アルバムをシャッフル"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "ループ"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
-msgstr ""
+msgstr "全体をループ"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
-msgstr ""
+msgstr "単一の曲をループ"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
-msgstr ""
+msgstr "ループしない"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "再生に従ってスクロール"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "再生に従ってカーソルを移動"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "現在の再生の終了後に停止"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "現在のトラックへ飛ぶ"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "更新履歴(_C)"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "情報(_A)"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "翻訳者(_T)"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "検索"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "停止"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "再生"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "ポーズ"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "前へ"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "次へ"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "ランダムに再生"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "情報"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "終了"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "トラックのプロパティ"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
-msgstr ""
+msgstr "場所:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "設定"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "適用(_A)"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "メタデータ"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "プロパティ"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "タイトル:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "新規カラムのタイトルをここに入力します"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "形式:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "アイテムのインデックス"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "再生"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "アルバムアート"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "アーティスト - アルバム"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "演奏時間"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "トラック番号"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "バンド / アルバムのアーティスト"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "書式:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "配置:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "左"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "右"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "出力プラグイン:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "出力デバイス:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
-msgstr "常に 8 bit オーディオを 16 bit に変換する"
+msgstr "8 bit オーディオを常に 16 bit に変換する"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
-msgstr ""
+msgstr "16 bit オーディオを常に 24 bit に変換する"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "音声"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "リプレイゲインのモード:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "無効"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "トラック"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "リプレイゲインのピークを調整する"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "リプレイゲインのプリアンプ:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "全体のプリアンプ:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "コマンドライン (あるいはファイルマネージャ) からこのプレイリストにファイルを"
 "追加"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "立ち上げ時に前回のセッションを復元する"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "フォルダを追加するときアーカイブを含まない"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "現在の再生の終了後にリセット"
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "再生"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "設定"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP チェインプリセット"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "ロード(_L)"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "ウィンドウを閉じたときシステムトレイに格納"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "システムトレイのアイコンを隠す"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
+msgid "Enable Russian CP1251 detection and recoding"
+msgstr "ロシア語の CP1251 の検出と記録を有効にする"
+
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
-msgstr ""
+msgstr "中国語の CP936 の検出と記録を有効にする"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "インタフェースの更新頻度 (毎秒):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "再生中のタイトルバーの文字列:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "停止中の文字列:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "GUI プラグイン (再スタートが必要です):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
-msgstr ""
+msgstr "プレーヤ"
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "プレイリストをマウスの中ボタンで閉じる"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
-msgstr ""
+msgstr "再生中のトラックは太字で表示する"
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "コンテキストメニューの \"ディスクから削除\" を隠す"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
-msgstr "一つのフォルダから追加するときはプレイリストの名前を自動でつける"
+msgstr "単一のフォルダを追加するときはプレイリスト名を自動でつける"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "カラムをウィンドウに合わせて自動リサイズする"
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
-msgstr ""
+msgstr "GUI/他"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "デフォルトを上書きする"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "前景色"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "背景色"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "シークバーと音量バーの色"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "中間色"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "明色"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "暗色"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "基底色"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "文字色"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "タブの色"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "デフォルトを上書きする (GTKテーマが不適用になりますが描画が高速化します)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "偶数行"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "奇数行"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "選択の行"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "選択の文字色"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "カーソル"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "プレイリストの色"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "色"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "プロクシサーバを有効にする"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "プロクシサーバのアドレス:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "プロクシサーバのポート番号:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "プロクシの形式:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "プロクシのユーザ名:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "プロクシのパスワード:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
-msgstr ""
+msgstr "HTTP ユーザエージェント:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
-msgstr ""
+msgstr "コンテントタイプの割り当てを編集する"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "ネットワーク"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
-msgstr ""
+msgstr "割り当て済みのホットキー:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
-msgstr ""
+msgstr "動作:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
-msgstr ""
+msgstr "<未設定>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
-msgstr ""
+msgstr "キーの組み合わせ:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
-msgstr ""
+msgstr "グローバルホットキー"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
 msgstr ""
+"適用ボタンで変更を保存します。または元に戻す\n"
+"ボタンで変更を取り消します。適用を押さない限り\n"
+"変更は保存されません。"
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
-msgstr ""
+msgstr "デフォルト(_D)"
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
-msgstr ""
+msgstr "ホットキー"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
-msgstr "バージョン:"
+msgstr "バージョン: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
-msgid "Group By ..."
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+msgid "Group By ..."
+msgstr "...でグループ化"
+
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
-msgstr ""
+msgstr "...で並び替え"
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "書式"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "昇順"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "降順"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "DSP プラグインの選択"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "プラグイン"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "タグ書き出しの設定"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "ID3v2 の書き出し"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "ID3v1 の書き出し"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "APEv2 の書き出し"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "ID3v2 の除去"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "ID3v1 の除去"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "APEv2 の除去"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 のバージョン"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (推奨)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 の文字エンコーディング (デフォルトは iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 の書き出し"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
-msgstr ""
+msgstr "コンテントタイプの割り当て"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
+"この表はネットワークストリームのコンテントタイプと DeaDBeeF のデコーダプラグ"
+"インとの対応を表しています。例えば、MP3ファイルは \"audio/x-mpeg\" というコン"
+"テントタイプを持ち、それはDeaDBeeF自身の \"stdmpg\" プラグインか、あるいは "
+"\"ffmpeg\" プラグインでデコードされます。"
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
-msgstr ""
+msgstr "デフォルトに戻す"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
-msgstr ""
+msgstr "コンテントタイプ:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
-msgstr ""
+msgstr "プラグイン:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
-msgstr ""
+msgstr "ボタンのプロパティ"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
-msgstr ""
+msgstr "色:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
-msgstr ""
+msgstr "テキスト色:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
-msgstr ""
+msgstr "アイコン:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
-msgstr ""
+msgstr "ラベル:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
+msgstr "動作の選択"
+
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "アーティスト / アルバム"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "トラック番号"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "再生キューへ追加"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "再生キューから削除"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "メタデータを再読み込み"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "ディスクから削除"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "カラムの追加"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "カラムの編集"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "カラムの削除"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
-msgstr ""
+msgstr "スクロール中にグループをピン止め"
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "グループ化"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "なし"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "アーティスト/日付/アルバム"
 
@@ -1103,19 +1154,19 @@ msgstr "%s の設定"
 msgid "Default Audio Device"
 msgstr "デフォルトの音声デバイス"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr ""
+msgstr "あなたはホットキーの設定を変更しましたが、保存していません。"
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
-msgstr ""
+msgstr "保存せずに続行しますか?"
 
 #: ../plugins/gtkui/progress.c:56
 msgid "Adding files..."
 msgstr "ファイルの追加..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "初期化中..."
 
@@ -1128,128 +1179,128 @@ msgid "Really close the window?"
 msgstr "本当にウィンドウを閉じますか?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[複数の値] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "キー"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "値"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
-msgstr ""
+msgstr "[複数の値]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "タグの書き出し中..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
-msgstr ""
+msgstr "フィールド名"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "名前:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "フィールドは : や _ で始まることができません"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "フィールドを追加できません"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "同じ名前のフィールドがあります。別の名前で試してください。"
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "フィールドを追加"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "フィールドを削除"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "使い方: deadbeef [オプション] [--] [ファイル...]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "オプション:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  or  -h     ヘルプ (このメッセージ) を表示して終了\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             プレイヤを終了する\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          バージョン情報を表示して終了\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             再生を開始する\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             再生を停止する\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            ポーズする\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     ポーズのトグル\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr "   --play-pause       停止中なら再生開始し、でなければポーズします\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             プレイリストの次の曲へ\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             プレイリストの前の曲へ\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           プレイリストからランダムに選んだ曲へ\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            ファイルを既存のプレイリストに追加する\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
@@ -1257,12 +1308,12 @@ msgstr ""
 "   --gui PLUGIN       使用する GUI プラグインを指定します。デフォルトは "
 "\"GTK2\"\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying 書式  書式化されたトラック名を stdout に書き出します\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1274,7 +1325,7 @@ msgstr ""
 "                      長さ[l], トラック番号[n], 年[y], コメント[c],\n"
 "                      著作権[r], 経過時間[e]\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1283,28 +1334,24 @@ msgstr ""
 "                      例: --nowplaying \"%%a - %%t\" は \"アーティスト - タイ"
 "トル\" と表示します\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      詳しくはこちら: http://sourceforge.net/apps/mediawiki/"
-"deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "はい"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "いいえ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1330,7 +1377,7 @@ msgstr ""
 "バンド / アルバムのアーティスト\n"
 "カスタム"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1338,7 +1385,7 @@ msgstr ""
 "左\n"
 "右"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1348,7 +1395,7 @@ msgstr ""
 "トラック\n"
 "アルバム"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1356,7 +1403,7 @@ msgstr ""
 "昇順\n"
 "降順"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1364,14 +1411,7 @@ msgstr ""
 "2.3 (推奨)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Pixmap ファイルが見つかりません: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1384,7 +1424,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1431,7 +1471,7 @@ msgstr "Scrobble URL"
 
 #: ../translation/extra.c:16
 msgid "Prefer Album Artist over Artist field"
-msgstr ""
+msgstr "アーティストのフィールドよりアルバムのアーティストを優先する"
 
 #. OSS output plugin
 #: ../translation/extra.c:18
@@ -1503,7 +1543,7 @@ msgstr "リサンプリングを品質 (0..2, 大きい方が高品質)"
 
 #: ../translation/extra.c:37
 msgid "8-bit output (default is 16)"
-msgstr ""
+msgstr "8-bit 出力 (デフォルトは 16)"
 
 #. Game_Music_Emu decoder plugin
 #: ../translation/extra.c:39
@@ -1512,7 +1552,7 @@ msgstr "最大の曲長 (分)"
 
 #: ../translation/extra.c:40
 msgid "Fadeout length (seconds)"
-msgstr ""
+msgstr "フェードアウトの長さ (秒)"
 
 #: ../translation/extra.c:41
 msgid "Play loops nr. of times (if available)"
@@ -1669,7 +1709,7 @@ msgstr "サンプルレートの指定"
 
 #: ../translation/extra.c:94
 msgid "Quality / Algorithm"
-msgstr ""
+msgstr "音質 / アルゴリズム"
 
 #: ../translation/extra.c:95
 msgid "Automatic Samplerate (overrides Target Samplerate)"
@@ -1677,13 +1717,13 @@ msgstr "サンプルレートの自動設定 (指定したサンプルレート
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
 msgid "Disable gapless playback (faster scanning)"
-msgstr ""
+msgstr "ギャップレス再生を無効にする (スキャンが早くなります)"
 
 #. adplug
 #: ../translation/extra.c:101
@@ -1692,114 +1732,119 @@ msgstr ""
 
 #: ../translation/extra.c:102
 msgid "Enable surround"
+msgstr "サラウンドを有効にする"
+
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "そのファイルは既に存在します。上書きしますか?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "コンバータの警告"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "エンコーダを選択してください"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "変換エラー"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "変換中..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "フォルダの選択..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "エンコーダのプリセットの保存に失敗しました"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 "フォルダのパーミッション、名前の重複、ディスクの空き容量を確認してください"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "同じ名前のプリセットが既にあります。別の名前で試してください。"
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "エラー"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "新規エンコーダの追加"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "エンコーダの編集"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "プリセットの削除"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "選択中のプリセットを削除します。続けますか?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "エンコーダ"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "プラグインを DSP チェインに追加"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "DSP プリセットの保存に失敗しました"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "新規の DSP プリセット"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "DSP プリセットの編集"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP プリセット"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "出力先フォルダ:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr "元のトラックと同じフォルダに書く"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr "フォルダ構造を保存する"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "出力ファイル名:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1809,89 +1854,89 @@ msgstr ""
 "拡張子 (.mp3など) は自動で追加されます。\n"
 "このフィールドを空にするとデフォルトを使います (%a - %t)。"
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "エンコーダ:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP のプリセット:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "スレッドの数:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "出力のサンプルのフォーマット:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "元のままにする"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 bit 符号つき整数"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 bit 符号つき整数"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 bit 符号つき整数"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 bit 符号つき整数"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 bit 浮動小数点数"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "ファイルが存在するとき:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "尋ねる"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "上書きする"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "エンコーダのプリセット設定"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "無題のエンコーダ"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "出力ファイルの拡張子:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "例: mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "コマンドライン:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1901,7 +1946,7 @@ msgstr ""
 "例: lame - %o\n"
 "%i: 入力ファイル, %o: 出力ファイル, -: 標準入力"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1911,66 +1956,72 @@ msgstr ""
 "<small>%o - 出力先のファイル名\n"
 "%i - 入力の一時ファイル名</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "経由する:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "パイプ"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "一時ファイル"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>タグ書き出し</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "DSP プリセットエディタ"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "無題の DSP プリセット"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "追加"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Pixmap ファイルが見つかりません: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2006,29 +2057,29 @@ msgstr ""
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
-msgstr "シェルのコマンド"
+msgstr "シェルコマンドの設定"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "編集"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "閉じる"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "コマンドの編集"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "コマンド:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2039,17 +2090,17 @@ msgstr ""
 "任意のシェルのコマンド。アプリケーションを立ち上げたシェルのコンテキストから"
 "実行されます。xdg-open %D のような書式が使えます"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "ID:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr "\"My Shell Command\" のような自由な形式の名前"
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
@@ -2057,158 +2108,163 @@ msgid ""
 msgstr ""
 "コマンド ID (\"youtube_open\" のような短い識別子)。一意である必要があります"
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr "単一トラック"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "単一のトラックに対して動作します"
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "複数トラック"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "複数のトラックに対して動作します"
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "ローカル"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "ローカルのファイルに対して動作します"
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr "リモート"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr "リモートのファイル (http:// ストリームなど) に対して動作します"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "一般 (メインメニュー)"
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "アイテムはメインメニューに現れます"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version.</small>"
 msgstr ""
+"<small>メインメニューにコマンドを追加したい場合、そのタイトルがメニューパスを"
+"以下のように含んでいることを確かめてください: \"File/My Command\", ここでメ"
+"ニュー名 File は英語版でのものです。</small>"
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "コマンドの追加"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "削除"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "選択中のシェルのコマンドを削除します。続けますか?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr "削除の確認"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr "IDは空でなく、一意である必要があります\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr "タイトルは空にできません\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr "シェルのコマンドは空にできません\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "不正な値"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
-msgstr ""
+msgstr "サポートされている音声フォーマット"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
-msgstr ""
+msgstr "すべてのファイル (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
-msgstr ""
+msgstr "ファイルを開く..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
-msgstr ""
+msgstr "プレイリストにファイルを追加..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
-msgstr ""
+msgstr "プレイリストにフォルダを追加..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
-msgstr ""
+msgstr "シンボリックリンクを追跡する"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
-msgstr ""
+msgstr "help.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
-msgstr ""
+msgstr "ファイルをディスクから削除する"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
+"ファイルは失われます。続けますか?\n"
+"(このダイアログは GTKUI プラグインの設定で非表示にできます)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
-msgstr ""
+msgstr "プレイリストのロード"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
-msgstr ""
+msgstr "その他のファイル (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
-msgstr ""
+msgstr "プレイリストに名前を付けて保存"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr ""
+msgstr "DeaDBeeF プレイリストファイル (*.dbpl)"
 
 #: ../plugins/gtkui/ctmapping.c:129
 msgid "Content-Type"
-msgstr ""
+msgstr "コンテントタイプ"
 
 #: ../plugins/gtkui/ctmapping.c:199
 msgid "Invalid value(s)."
-msgstr ""
+msgstr "不正な値です。"
 
 #: ../plugins/gtkui/ctmapping.c:200
 msgid ""
@@ -2220,107 +2276,123 @@ msgid ""
 "Content type should be only letters, numbers and '-' sign.\n"
 "Plugin id can contain only letters and numbers."
 msgstr ""
+"コンテントタイプとプラグインのフィールとは空にはできません。\n"
+"そして以下のルールに従ってください。\n"
+"コンテントタイプの例: 'audio/mpeg'\n"
+"プラグイン ID の例: 'stdmpg ffmpeg'\n"
+"プラグイン ID のリストはスペースで区切りとします。\n"
+"コンテントタイプは文字、数字、また '-' 記号で構成されます。\n"
+"プラグイン ID は文字と数字だけからなります。"
 
 #: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
 msgid "Nothing is selected."
+msgstr "選択がありません。"
+
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
-msgstr ""
+msgstr "...で置き換える"
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
-msgstr ""
+msgstr "...を挿入する"
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
-msgstr ""
+msgstr "カット"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
-msgstr ""
+msgstr "コピー"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
-msgstr ""
+msgstr "ペースト"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
-msgstr ""
+msgstr "このタイプのウィジェットを複数利用することはできません"
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
-msgstr ""
+msgstr "固定する"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
-msgstr ""
+msgstr "タブを左に移動"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
-msgstr ""
+msgstr "タブを右に移動"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
-msgstr ""
+msgstr "タブの削除"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
-msgstr ""
+msgstr "タブの名前変更"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
-msgstr ""
+msgstr "新規タブの追加"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
-msgstr ""
+msgstr "カラムヘッダの表示"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
-msgstr ""
+msgstr "ボックスを 1 アイテム分広げる"
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
-msgstr ""
+msgstr "ボックスを 1 アイテム分縮める"
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
-msgstr ""
+msgstr "大きさを揃える"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
-msgstr ""
+msgstr "広げる"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
-msgstr ""
+msgstr "余白を埋める"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
+msgstr "設定ボタン"
+
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
 msgstr ""
 
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
-msgstr ""
+msgstr "プレイリストの編集"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
-msgstr ""
+msgstr "プレイリストの名前変更"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
-msgstr ""
+msgstr "プレイリストの除去"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
-msgstr ""
+msgstr "新規プレイリストの追加"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
-msgstr ""
+msgstr "名前"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
-msgstr ""
+msgstr "プレイリストブラウザ"
diff --git a/po/kk.po b/po/kk.po
index 4811b39..7392ef0 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Baurzhan Muftakhidinov <baurthefirst at gmail.com>, 2010,2013
+# Baurzhan Muftakhidinov <baurthefirst at gmail.com>, 2010,2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Kazakh (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/kk/)\n"
 "Language: kk\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "DeaDBeeF %s туралы"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s өзгерістері"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF аудармашылары"
@@ -86,916 +86,950 @@ msgstr "Алдын-ала күшейтуді нөлдеу"
 msgid "Zero Bands"
 msgstr "Жиіліктерді нөлдеу"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Сақталған баптаулар"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 күн %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d күн %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Тоқтатылған | %d трек | %s жалпы уақыты"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Моно"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Стерео"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d кбит/с "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Аялдатылған | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr "%s%s %s| %dГц | %d бит | %s | %d:%02d / %s | %d трек | %s жалпы уақыты"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Жаңа ойнату тізімі"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Жаңа ойнату тізімі (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Беттері бар ойнату тізімі"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Ойнату тізімі"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "Ажыратқыш (жоғары және төмен)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "Ажыратқыш (сол және оң жақ)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "Ойнату тізім беттері"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Таңдалғанның қасиеттері"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Альбом мұқабасын көрсету"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "Scope"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "Спектралды талдағыш"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Батырма"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Көмек файлын оқу сәтсіз"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Көмек файлын жүктеу сәтсіз"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
-"Плеер ағымдағы уақытта бірнеше фон тапсырмаларын орындап жатыр. Қазір "
-"жұмысын аяқтасаңыз, ол тапсырмалардан бас тартылады, немесе олар үзіледі. "
-"Бұл деректер жоғалуына әкеп соғуы мүмкін."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "Шығуды шынымен қалайсыз ба?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Ескерту"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Файл"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "Ф_айл(дар)ды ашу"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Файл(дар)ды қосу"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Бума(лар)ды қосу"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Орналасуы бойынша қосу"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Жаңа ойнату тізімі"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Ойнату тізімін жүктеу"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Ойнату тізімін сақтау"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Шығу"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "Тү_зету"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "Та_зарту"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Барлығын таңдау"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Таңдауды алып тастау"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Таңдауды терістеу"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Таңдалған"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Өшіру"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Одан басқасын өшіру"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "Ізд_еу"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Қалайша сұрыптау"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Атауы"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Трек нөмірі"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Альбом"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Әртіс"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Күні"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Кездейсоқ"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Таңдауыңызша"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Баптаулар"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Түрі"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Қалып-күй жолағы"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Эквалайзер"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "Дизайн режимі"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "О_йнату"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Реті"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Қалыпты"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Тректерді араластыру"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Альбомдарды араластыру"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Қайталау"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Барлығын қайталау"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Бір тректі қайталау"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "Қайталамау"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Ағымдағы трек атын айналдыру"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Ағымдағы тректі ерекшелеу"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Ағымдағысынан кейін тоқтату"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Ағымдағы трекке өту"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Көмек"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "Өз_герістер"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "О_сы туралы"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "Ау_дармашылар"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Іздеу"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Тоқтату"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Ойнату"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Аялдату"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Алдыңғы"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Келесі"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Кездейсоқты ойнату"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Осы туралы"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Шығу"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Көмек"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Трек қасиеттері"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "Орналасуы:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Баптаулар"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "Іс_ке асыру"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Жабу"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Метаақпарат"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Қасиеттері"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Атауы:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Жаңа баған атауын осында енгіңіз"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Түрі:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Реттік нөмірі"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Ойналуда"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Альбом суреті"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Әртіс - Альбом"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Ұзақтығы"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Трек нөмірі"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Топ / Альбом әртісі"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Пішімі:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Туралауы:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Сол жақ"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Оң жақ"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "Ба_с тарту"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Шығыс плагин:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Шығыс құрылғы:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "8 биттік аудионы әрқашан 16 биттіке түрлендіру"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "16 биттік аудионы әрқашан 24 биттіке түрлендіру"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Дыбыс"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Дыбыс қаттылығын авто түзету:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Сөндірулі"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Трек"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Пиктік мәнін қолдану"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 дБ"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 дБ"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Дыбыс қаттылығын автотүзетудің алдын-ала күшейтілуі:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Дыбыс қаттылығын жалпы алдын-ала күшейту:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Бұл ойнату тізіміне файлдарды командалық жолдан (не файлдар басқарушысынан) "
 "қосу:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Қосылғанда, соңғы сессияны жалғастыру"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Бумаларды қосқан кезде архивтерден қоспау"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "\"Ағымдағысынан кейін тоқтатуды\" автотастау"
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Ойнату үрдісі"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Баптау"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP тізбегінің баптауы"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "Жү_ктеу"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Жабу орнына трейге орналастыру"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Жүйелік сөре таңбашасын жасыру"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "Орыс CP1251 кодталуын анықтауды және қайта кодтауды іске қосу"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Қытайша CP936 кодталуын анықтауды және қайта кодтауды іске қосу"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Интерфейсті жаңарту жиілігі (секундына рет)"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Ойнатылған кездегі атау мәтіні:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Тоқтатылған кездегі атау мәтіні:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "GUI плагині (ауыстырылса, қайта қосу керек):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
-msgstr ""
+msgstr "Плеер"
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Ойнату тізімдерін тышқанның орта батырмасымен жабу"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
-msgstr ""
+msgstr "Ойнатылып жатқан тректі жуан қаріппен көрсету"
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "\"Қатты дисктен өшіру\" нұсқасын контекст мәзірінде көрсетпеу"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Бірлік буманы қосқан кезде ойнату тізімін автоатау"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "Бағандар өлшемдерін терезеге сыятындай автоөзгерту"
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "Интерфейс/түрлі"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Алмастыру"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Алдыңғы көрінісі"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Фон"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Үрдіс/дыбыс жолақтарының түстері"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Ортасы"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Ашық түсті"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Күңгірт"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Негізгі"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Мәтін"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Беттер"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Алмастыру (GTK темасының баптаулары жоғалады, бірақ жылдамдығы артады)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Жұп жол"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Тақ жол"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Ерекшеленген жол"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Ерекшеленген мәтін"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Курсор"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Ойнату тізім түстері"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Түстер"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Прокси серверді іске қосу"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Прокси сервер адресі:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Прокси сервер порты:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Прокси түрі:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Прокси пайдаланушысы:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Прокси паролі:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr "Content-Type сәйкестіктерін түзету"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Желі"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr "Тағайындалған ыстық пернелер:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr "Әрекет:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr "<Орнатылмаған>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr "Пернелер комбинациясы:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "Глобалды ыстық перне"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
 msgstr ""
+"Өзгерістерді сақтау үшін Іске асыру, ал, оларды\n"
+"болдырмау үшін Қайтару батырмасын қолданыңыз.\n"
+"Іске асыру батырмасын баспасаңыз,\n"
+"өзгерістер сақталмайды."
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
-msgstr ""
+msgstr "_Бастапқы"
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "Ыстық пернелер"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Нұсқасы:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Плагиндер"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "Қалайша топтау ..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "Қалайша сұрыптау ..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Пішімі"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Өсу ретімен"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Кему ретімен"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "DSP плагинін таңдау"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Плагин"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Тег жазушысы баптаулары"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "ID3v2 жазу"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "ID3v1 жазу"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "APEv2 жазу"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "ID3v2 алып тастау"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "ID3v1 алып тастау"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "APEv2 алып тастау"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 нұсқасы"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Ұсынылады)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 таңбалар кодталуы (бастапқысы iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 жазу"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr "Content-Type сәйкестіктері"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1007,91 +1041,100 @@ msgstr ""
 "\"audio/x-mpeg\" болады, және оны DeaDBeeF-тің өздік \"stdmpg\" плагині, не "
 "\"ffmpeg\" плагині декодтауы керек."
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr "Бастапқы мәндеріне тастау"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr "Content-Type:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "Плагиндер:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr "Батырма қасиеттері"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr "Түсі:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr "Мәтін түсі:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr "Таңбаша:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr "Белгі:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr "Әрекетті таңдаңыз"
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Әртіс / Альбом"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Трек №"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Ойнату кезегіне қосу"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Ойнату кезегінен өшіру"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Метаақпаратты қайта жүктеп алу"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Дискіден өшіру"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Бағанды қосу"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Бағанды түзету"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Бағанды өшіру"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
-msgstr ""
+msgstr "Айналдыру кезінде топтарды бекіту"
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Қалайша топтау"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Ешнәрсе"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Әртіс/Күні/Альбом"
 
@@ -1108,19 +1151,20 @@ msgstr "%s баптау"
 msgid "Default Audio Device"
 msgstr "Негізгі дыбыс құрылғысы"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
+"Сіз ыстық перне жарлығын өзгерттіңіз, бірақ, өзгерістерді сақтаған жоқсыз."
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
-msgstr ""
+msgstr "Сақтамай-ақ жалғастыруды қалайсыз ба?"
 
 #: ../plugins/gtkui/progress.c:56
 msgid "Adding files..."
 msgstr "Файлдарды қосу..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Іске қосылуда..."
 
@@ -1133,129 +1177,129 @@ msgid "Really close the window?"
 msgstr "Терезені шынымен жабу керек пе?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Бірнеше мәндер] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Кілт"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Мәні"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[Бірнеше мәндер] "
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Тегтерді жазу..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "Өріс атауы"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Аты:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Өріс атауы : не _ таңбаларынан басталмауы тиіс"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Өрісті қосу мүмкін емес"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Ондай атымен өріс бар болып тұр, басқа атауын көрсетіңіз."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Өрісті қосу"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Өрісті өшіру"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "Қолданылуы: deadbeef [опциялар] [файл(дар)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Опциялары:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  не  -h     Көмек ақпаратын (осы) шығару мен шығу\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Плеерді жабу\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Нұсқа ақпаратын шығару мен шығу\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Ойнатуды бастау\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Ойнатуды тоқтату\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Ойнатуды аялдату\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Паузаны ауыстыру\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 "   --play-pause       Тоқтатылған болса, ойнату, болмаса, паузаны ауыстыру\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Ойнату тізіміндегі келесі трек\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Ойнату тізіміндегі алдыңғы трек\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Ойнату тізіміндегі кездейсоқ трек\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Файл(дар)ды бар ойнату тізіміне қосу\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
@@ -1263,12 +1307,12 @@ msgstr ""
 "   --gui PLUGIN       Қолданылатын GUI плагинін көрсетеді. Бастапқысы "
 "\"GTK2\"\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying ПШМ   Шығысқа пішімделген трек атын шығару\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1279,7 +1323,7 @@ msgstr ""
 "                      [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 "                      copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1288,28 +1332,24 @@ msgstr ""
 "                      мыс.: --nowplaying \"%%a - %%t\" экранға \"artist - "
 "title\" шығаруы тиіс\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      көбірек білу үшін,  http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting қараңыз\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Бастапқы"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Иә"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Жоқ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1335,7 +1375,7 @@ msgstr ""
 "Топ / Альбом әртісі\n"
 "Таңдауыңызша"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1343,7 +1383,7 @@ msgstr ""
 "Сол жақ\n"
 "Оң жақ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1353,7 +1393,7 @@ msgstr ""
 "Трек\n"
 "Альбом"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1361,7 +1401,7 @@ msgstr ""
 "Өсу ретімен\n"
 "Кему ретімен"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1369,14 +1409,7 @@ msgstr ""
 "2.3 (Ұсынылады)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Сурет файлын табу мүмкін емес: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1389,8 +1422,8 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "Аудио CD қосу"
+msgid "Add Audio CD"
+msgstr ""
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1682,8 +1715,8 @@ msgstr "Дискреттеудің автожиілігі (дискреттеу
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
-msgstr "Таңдауыңызша қоршам командаларын баптау"
+msgid "Configure Custom Shell Commands"
+msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
@@ -1699,35 +1732,40 @@ msgstr "Ken эмуляторын Satoh басым есептеу (surround жа
 msgid "Enable surround"
 msgstr "Surround іске қосу"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Файл бар болып тұр. Оны үстінен жазу керек пе?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Түрлендіруші ескертуі"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Кодтауышты таңдаңыз"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Түрлендіруші қатесі"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Түрлендіру..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Буманы тандаңыз..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Кодтауыштың баптауын сақтау сәтсіз"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1735,77 +1773,77 @@ msgstr ""
 "Баптау сақталатын бума рұқсаттарын тексеріңіз, басқа атауды таңдаңыз не "
 "біршама диск кеңістігін босатыңыз."
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "Ондай атымен баптау бар болып тұр. Басқа атын көрсетіңіз."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Қате"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Жаңа кодтауышты қосу"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Кодтауышты түзету"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Баптауды өшіру"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Бұл әрекет нәтижесінде таңдалған баптау өшіріледі. Осыны қалайсыз ба?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Кодтауыштар"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Плагинді DSP тізбегіне қосу"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "DSP баптауын сақтау сәтсіз"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Жаңа DSP баптауы"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "DSP баптауын түзету"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP баптаулары"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Шығыс бумасы:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr "Бастапқы трек бумасына жазу"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr "Бумалар құрылысын сақтау"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Шығыс файл аты:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1815,89 +1853,89 @@ msgstr ""
 "Кеңейтуі (мыс. .mp3) автоқосылады.\n"
 "Үнсіз келісім үшін бос қалдырыңыз (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Кодтауыш:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP баптауы:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Ағымдар саны:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Сэмплдердің шығыс пішімі:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Бастапқы пішімді қалдыру"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 биттік таңбалы бүтін"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 биттік таңбалы бүтін"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 биттік таңбалы бүтін"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 биттік таңбалы бүтін"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 биттік қалқымалы"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Файл бар болса:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Сұрау"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Үстінен жазу"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Кодтауыш баптауын түзету"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Атауысыз кодтауыш"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Шығыс файлдың кеңейтуі:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Мыс. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Командалық жол:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1907,7 +1945,7 @@ msgstr ""
 "Мысалы: lame - %o\n"
 "%i кіріс файлы, %o шығыс файлы үшін, - stdin үшін"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1917,66 +1955,72 @@ msgstr ""
 "<small>%o - шығыс файлы аты\n"
 "%i - уақытша кіріс файлының аты</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Тәсіл:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Pipe"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Уақытша файл"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Тег жазушысы</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "DSP баптау түзетушісі"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Атаусыз DSP баптауы"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Қосу"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Сурет файлын табу мүмкін емес: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2014,27 +2058,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr "Таңдауыңызша қоршам командалары"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "Түзету"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "Жабу"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "Команданы түзету"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "Команда:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2046,17 +2090,17 @@ msgstr ""
 "контекстінде жөнелтілетін болады. Атаудың пішімдеуін қолдануға болады. "
 "Мысалы: xdg-open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "ID:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr "Таңдауыңызша атауы, мыс. \"Менің қоршам командам\""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
@@ -2065,130 +2109,133 @@ msgstr ""
 "Команданың ID-і, әдетте ол қысқа бірнәрсе болуы тиіс, мыс. \"youtube_open\". "
 "Және де ол бірегей болуы тиіс."
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr "Дара тректер"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "Дара тректе жұмыс істейді."
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "Бірнеше трек"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "Бірнеше тректе жұмыс істейді."
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "Жергілікті"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "Жергілікті файлдарда жұмыс істейді."
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr "Қашықтағы"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr "Қашықтағы файлдарда жұмыс істейді (мыс, http:// streams)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "Жалпы (басты мәзір)"
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "Нәрсе басты мәзірден көрінуі тиіс"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version.</small>"
 msgstr ""
+"<small>Егер басты мәзірге команданы қосқыңыз келсе, оның атауында мәзір жолы "
+"болғанын тексеріңіз, келесідей: \"File/Менің командам\", бұл жердегі Файл - "
+"ағылшын тіліндегі мәзір аты.</small>"
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Команданы қосу"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "Өшіру"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "Бұл әрекет таңдалған қоршам командасын өшіреді. Осыны қалайсыз ба?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr "Өшіруді растау"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr "ID бос болмауы және бірегей болуы тиіс.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr "Атауы бос болмауы тиіс.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr "Қоршам командасы бос болмауы тиіс.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "Қате мәндер"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr "Қолдауы бар дыбыс пішімдері"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "Барлық файлдар (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr "Файл(дар)ды ашу..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr "Файл(дар)ды ойнату тізіміне қосу..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr "Бума(лар)ды ойнату тізіміне қосу..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr "Сілтемелерден өту"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr "help.kk.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "Файлдарды дисктен өшіру"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -2196,19 +2243,19 @@ msgstr ""
 "Файлдар жоғалады. Жалғастыру керек пе?\n"
 "(Бұл сұхбатты GTKUI плагин баптауларында сөндіруге болады)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "Ойнату тізімін жүктеу"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "Басқа файлдар (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr "Ойнату тізімін қалайша сақтау"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF ойнату тізімі файлдары (*.dbpl)"
 
@@ -2242,102 +2289,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr "Ешнәрсе таңдалмады."
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr "Немен алмастыру..."
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr "Кірістіру..."
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr "Қиып алу"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr "Көшіру"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr "Кірістіру"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
-msgstr ""
+msgstr "Бұл түрдегі бірнеше виджеттерге қолдау жоқ"
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr "Жылжытуды блоктау"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr "Бетті солға жылжыту"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr "Бетті оңға жылжыту"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr "Бетті өшіру"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr "Беттің атын ауыстыру"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr "Жаңа бетті қосу"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr "Бағандар атауларын көрсету"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr "Бұл боксты 1 элементке кеңейту"
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr "Бұл боксты 1 элементке азайту"
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr "Біртектес"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr "Жазу"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr "Толтыру"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr "Батырманы баптау"
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
-msgstr ""
+msgstr "Ойнату тізімін түзету"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
-msgstr ""
+msgstr "Ойнату тізімінің атын өзгерту"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
-msgstr ""
+msgstr "Ойнату тізімін өшіру"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
-msgstr ""
+msgstr "Жаңа ойнату тізімін қосу"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
-msgstr ""
+msgstr "Аты"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
-msgstr ""
+msgstr "Ойнату тізімдерді шолу"
diff --git a/po/km.po b/po/km.po
index f7b4295..88c76e9 100644
--- a/po/km.po
+++ b/po/km.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/km/)\n"
 "Language: km\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "អំពី DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s ផ្លាស់ប្តួរកំណត់ហេតុ"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr ""
@@ -86,788 +86,815 @@ msgstr "គ្មានប្រដាប់បំពងសំលេង"
 msgid "Zero Bands"
 msgstr "គ្មានក្រុមតន្ត្រី"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "ម៉ូណូ"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "ស្តេរេអូ"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "ផ្អាក"
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "បង្កើតបញ្ជីរថ្មី"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr ""
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "មានកំហុសពេលកំពុងអានឯកសារជំនួយ"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "មានកំហុសពេលផ្ទុកឯកសារជំនួយ"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "ទិន្នន៍យ"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "បើកទិន្នន៍យ"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "បញ្ចួលទិន្នន៍យ"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "បង្កើតថត"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "បង្កើតទីតាំង"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "បញ្ជីរថ្មី"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "ផ្ទុកបញ្ជីរ"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "រក្សាទុកបញ្ជីរ"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "ចាកចេញ"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "កែសំរួល"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "ជម្រះ"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "ជ្រើសទាំងអស់"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "ដោះជម្រើសទាំងអស់"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "ដាក់បញ្ច្រាសជម្រើស"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "ជម្រើស"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "យកចេញ"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "ច្រឹប"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "សែ្វងរក"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "ចំណងជើង"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "អ៉ាល់បុ៑ម"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "អ្នកនិពន្ធ"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "ចៃដន្យ"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "ផ្ទាល់ខ្លួន"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "ចំណង់ចំណូលចិត្ត"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "មើល"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "របាស្ថានភាព"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "ធ្វើអោយស្មើគ្នា"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "ចាក់សារថ្មី"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "លំដាប់"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "លីនេអែ៑រ"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "ការរង្វិលជុំ"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "រមូរចាក់សារថ្មី"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "បញ្ចប់បន្ទាប់ពីបច្ចុប្បន្ន"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "ជំនួយ"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "ផ្លាស់ប្តួរកំណត់ហេតុ"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "អំពី"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "ស្វែងរក"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "ឈប់"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "ចាក់"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "ផ្អាក"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "មុន"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "បន្ទាប់"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "ចាក់ចែដន្យ"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "អំពី"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "លះបង់"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "ជំនួយ"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "ដានលក្ខណះសម្បត្តិ"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "អនុវត្ត"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "បិទ"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "មេតាទិន្នន៍យ"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "លក្ខណះសម្បត្តិ"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "ចំណងជើង"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "ប្រភេទ"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr ""
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "កំពុងលេង"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "តាក់តែងអ៉ាល់បុ៑ម"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "ម្ចាស់អ៉ាល់បុ៑ម"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "ក្រុម/ម្ចាស់អ៉ាល់បុ៑ម"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "ទ្រង់ទ្រាយ"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "តម្រឹម"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "ឆ្វេង"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "ស្តាំ"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "បោះបង់"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "យល់ព្រម"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "ទិន្នផលកម្មវីធីជំនួយ"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "សំលេង"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "ដាន"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -875,122 +902,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -998,91 +1031,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr ""
 
@@ -1099,11 +1141,11 @@ msgstr ""
 msgid "Default Audio Device"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1111,7 +1153,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "កំពុងផ្ទុកទិន្នន៍យ"
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr ""
 
@@ -1124,139 +1166,139 @@ msgid "Really close the window?"
 msgstr ""
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr ""
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr ""
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr ""
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr ""
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr ""
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr ""
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr ""
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr ""
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr ""
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr ""
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr ""
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr ""
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1264,33 +1306,31 @@ msgid ""
 "                      copy[r]ight, [e]lapsed\n"
 msgstr ""
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr ""
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr ""
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr ""
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1305,39 +1345,32 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
 "Album"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
 msgstr ""
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1347,7 +1380,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1640,7 +1673,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1657,111 +1690,116 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr ""
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1769,89 +1807,89 @@ msgid ""
 "Leave the field empty for default (%a - %t)."
 msgstr ""
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr ""
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr ""
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1859,7 +1897,7 @@ msgid ""
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1867,66 +1905,72 @@ msgid ""
 "%i - temporary input file name</small>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr ""
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr ""
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr ""
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr ""
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1954,27 +1998,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -1983,74 +2027,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2058,90 +2102,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2168,102 +2212,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/lg.po b/po/lg.po
index 16b6bbe..eaaa392 100644
--- a/po/lg.po
+++ b/po/lg.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# kizito <kbirabwa at yahoo.co.uk>, 2010
-# kizito <kbirabwa at yahoo.co.uk>, 2010
+# Kizito Birabwa <kbirabwa at yahoo.co.uk>, 2010
+# Kizito Birabwa <kbirabwa at yahoo.co.uk>, 2010
+# Kizito Birabwa <kbirabwa at yahoo.co.uk>, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Ganda (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/lg/)\n"
 "Language: lg\n"
@@ -20,17 +21,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Okwanjula DeaDBeef %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Olukalala lw'enyukakyuka eziri mu DeadBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Abaavvuunula DeaDBeeF"
@@ -94,795 +95,822 @@ msgstr "Ekikangalazaddoboozi ekisooka kisse ku zero"
 msgid "Zero Bands"
 msgstr "Amaloboozi gonna gadde ku zero"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Koppi ez'ebiteekateekedwa ezaaterekebwa"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "Lunaku 1 %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "Nnaku %d %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Eyimirizidwa | Ntambi %d | Awamu zimala %s"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Siteriyo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| kb %4d bs "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Luyimirizidwamu | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s%s| Hz %d | bbiti %d | %s | %d:%02d /%s | ntambi %d | Awamu zimala %s"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Kolawo olukalalala olupya"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Lukalalala olupya (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Wazewo kiremya mu kusoma fayiro ey'obuyambi"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Nnemedwa okubikkula fayiro ey'obuyambi"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Kulabula"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Fayiro"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Bikkula fayiro"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Teekako fayiro"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Teekako (ma)terekero"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Teekako obusangiro"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Kolwo olukalala olupya"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Soma olukalala lw'enyimba"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Kaza olukalala lw'enyimba"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Mala"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Kyusa"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Bisiimulewo"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Londa byonna"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Ta byonna"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Vuunika okulonda"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Ebirondedwa"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Bigyewo"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Bisagalewo byokka"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Zuula"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Erinnya"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Namba y'olutambi"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Alubamu"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Muluyimba"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Ennaku"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Muwawa"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Bye weteekateekedde"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Enteekateeka"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Endabika"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Olubaawo olulaga ebifa ku biwulirizibwa"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Ekiteekateeka entabula y'amaloboozi"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "Eby'em_puliriza"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Ensengeka"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Ku ziva kumukumu"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Vunga ntambi"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Vunga alubamu"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Eby'okuddiŋana"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Akaseesa kagoberere empuliriza y'enyimba"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Akasonga kagoberere empuliriza y'enyimba"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Luno bwe luggwa yimirira"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Genda ku lutambi olutangaazidwa"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Nyamba"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Enkyukakyuka"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Kwanjula"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Abaavvuunula"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Noonya"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Yimirira"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Wuliriza"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Yimirizamu"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Olukulembedde"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Oluddako"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Wuliriza muwawa"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Kwanjula"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Mala"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Nyamba"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Ebikwata ku lutambi"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Enteekateeka"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Bikaze"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Ggala"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Ebinyonyola"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Ebirufaako"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Mutwe:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Wandikawo omutwe g'olukumba"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Kika:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Lukalala lw'ebirimu"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Oluliko"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Bifaananyi bya ku alubamu"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Muluyimba - Alubamu"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Obwuwanvu bwa lwo"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Namba y'olutambi"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Kibiina / Muluyimba w'alubamu"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Empandika:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Okwekubirira:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Ku kkono"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Ku ddyo"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Sazamu"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_Kale"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Puloguramu efulumya ebiwulirizibwa:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Ebiwulirizibwa gye bifulumira:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Ebiwulirizibwa ebya bbiti 8 bifuulibwenga bya bbiti 16"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Kwogeza"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Maanyi g'eddoboozi ly'ebiwulirizibwa:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Gyako"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Lutambi"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Ekigero ky'amaanyi ge'ddoboozi ly'ebiwulirizibwa"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Maanyi g'eddoboozi ly'ebiwulirizibwa:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Genda ku lutambi olutangaazidwa:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Olukalala lw'ongereko fayiro nga weyambisa kiwandikiro (oba "
 "ekiteekateekafayiro):"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr ""
 "Puloguramu bw'etandikibwa etandikirenga gye yakoma ku mulundi ogwasemba"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Eby'empuliriza"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Teekateeka"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr ""
 "Ggala kireetera puloguramu okufuuka kafaananyi mu kakuŋaanyizo ka ku lubaawo"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Kisa akafaananyi ak'omu kakuŋaanyizo ka ku lubaawo"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Omutwe gw'eddirisa ng'oluyimba luwulirizibwa:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Omutwe gw'eddirisa nga puloguramu eyimirizidwa:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Ekya \"Siimula ku disiki\" kikise"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Ssawo enteekateeka eyiyo"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Bwanjo"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Bwaliriro"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Langi eziraga oluyimba we lutuuse/bwangufu bw'eddoboozi"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Langi eyawakkatikati"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Langi entangaavu"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Langi enzirugarivu"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Langi ey'omulamwa"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Bigambo"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Langi ez'oku bukonda"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Ssawo enteekateeka eyiyo (kiva ku lulyo lwa langi olwa sisitemu naye "
 "kyanguya puloguramu okulabika)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Nnyiriri kagabanyizikamubbiri"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Nnyiriri zinantagabanyizikamubbiri"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Olunyiriri olulondedwa"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Ebigambo ebirondedwa"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Akasonga"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Langi ez'oku lukalala lw'enyimba"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Langi"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Kozesa ekiwereza kimasanganzira"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Endagiriro y'ekiwereza kimasanganzira:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Pooti y'ekiwereza kimasanganzira:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Kika ky'ekiwereza:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Erinnya ery'okukozesa ku kiwereza:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Ekyama eky'oku kiwereza:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Kayungirizi"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -890,122 +918,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Puloguramu enyambi"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Empandika"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Puloguramu enyambi"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Wandika ebya ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Wandika ebya ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Wandika ebya APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Gyamu ebya ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Gyamu ebya ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Gyamu ebya APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Oluwandika lwa ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Tukuwa magezi ga kukozesa luno)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Enkongojja y'ebiwandike eby'omu ID3v1 (iso8859-1 y'eya bulijjo)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Wandika ebya ID32.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1013,91 +1047,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Muluyimba / Alubamu"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Namba y'olutambi"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Lwongere ku lukalala lw'ebinaawulirizibwa"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Lugye mu lukalala lw'ebinaawulirizibwa"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Ddamu okusoma ebinnyonyola"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Luggire ddala ku sisitemu"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Yongerako oukumbo"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Kyusa mu lukumbo"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Gyawo olukumbo"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Sengekera ku"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Tosengeka"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Muyimbi/Amafuluma/Alubamu"
 
@@ -1114,11 +1157,11 @@ msgstr ""
 msgid "Default Audio Device"
 msgstr "Ekyuma ekikola ku biwulirizibwa bulijjo"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1126,7 +1169,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Nyongerako fayiro..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Nteekateeka..."
 
@@ -1139,153 +1182,153 @@ msgid "Really close the window?"
 msgstr "Eddirisa lino ddala liggalibwewo?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Ppeesa"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Ekikongojje"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr ""
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Obuwayiro:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr ""
 "   --help  oba  -h     Bw'ossawo kamu ku buno, okoma ku kufuna bino "
 "by'osoma\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Kano kaleetera puloguramu okumala\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr ""
 "   --version          Kano kaleetera puloguramu okukoma ku kukulaga "
 "olwandika lwa yo\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Kano kaleetera pulguramu okutandika enyimba\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Kano kaleetera pulguramu okukomya oluyimba\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr ""
 "   --pause            Kano kaleetera puloguramu okuyimirizamu oluyimba\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr ""
 "   --next             Kano kaleetera puloguramu okutandika oluyimba oluddako "
 "mu lukalala\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr ""
 "   --prev             Kano kaleetera puloguramu okutandika olukulembera "
 "lw'ebadde ko mu lukalala\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr ""
 "   --random           Kano kaleetera puloguramu okuyita mu nyimba muwawa\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr ""
 "   --queue            Kano kaleetera puloguramu okwongera nyimba ku "
 "lukalala\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 "   --nowplaying FMT  Kano kaleetera puloguramu okuwandikawo erinnya "
 "ly'olutambi\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1299,7 +1342,7 @@ msgstr ""
 "                      r: Ebikugizo by'obwa nannyini, e: Ekitundu ky'oluyimba "
 "ekiwulirizidwako\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1308,26 +1351,24 @@ msgstr ""
 "                      okugeza.: --nowplaying \"%%a - %%t\" kisuubirwa "
 "okuvaamu \"muyibi - linnya lya luyimba\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Olukwatakifo"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Ye"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Nedda"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1342,7 +1383,7 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1350,7 +1391,7 @@ msgstr ""
 "Kkono\n"
 "Dyo"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1360,13 +1401,13 @@ msgstr ""
 "Lutambi\n"
 "Alubamu"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1374,14 +1415,7 @@ msgstr ""
 "2.3 (Tukuwa magezi kukozesa luno)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Fayiro erimu ekifaananyi embuze: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1394,7 +1428,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1687,7 +1721,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1704,111 +1738,116 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr ""
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1816,89 +1855,89 @@ msgid ""
 "Leave the field empty for default (%a - %t)."
 msgstr ""
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr ""
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr ""
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1906,7 +1945,7 @@ msgid ""
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1914,66 +1953,72 @@ msgid ""
 "%i - temporary input file name</small>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr ""
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr ""
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr ""
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Kaza"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Fayiro erimu ekifaananyi embuze: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2001,27 +2046,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2030,74 +2075,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2105,90 +2150,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2215,102 +2260,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index dd25816..5a36718 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Lithuanian (http://www.transifex.com/projects/p/deadbeef-"
 "player/language/lt/)\n"
 "Language: lt\n"
@@ -21,17 +21,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Apie DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s keitimų žurnalas"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF Vertėjai"
@@ -88,44 +88,44 @@ msgstr "Atstatyti Preamp"
 msgid "Zero Bands"
 msgstr "Atstatyti Bands"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Nustatymų rinkiniai"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 diena %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dienos %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Sustabdyta | %d takeliai | %s bendras grojimo laikas"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Sustabdyta | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -133,748 +133,775 @@ msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d takeliai | %s bendras "
 "grojimo laikas"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Naujas grojaraštis"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Naujas grojaraštis (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Grojaraštis"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Klaida skaitant pagalbos failą"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Pagalbos failo įkelti nepavyko"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Failas"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Atverti failą(-us)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Pridėti failą (-us)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Pridėti aplanką(-us)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Pridėti vietą"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Naujas grojaraštis"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Įkelti grojaraštį"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Išsaugoti grojaraštį"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "I_šeiti"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "K_eisti"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "Iš_valyti"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Pasirinkti visus"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Atžymėti viską"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Atvirkštinis pasirinkimas"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Pasirinkimas"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Pašalinti"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Apkirpti"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Ieškoti"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Rikiuoti pagal"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Pavadinimas"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Takelio numeris"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Albumas"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Atlikėjas"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Data"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Atsitiktine tvarka"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Pasirinkta"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Nustatymai"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "R_odymas"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Būsenos juosta"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Ekvalaizeris"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Atkūrimas"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Tvarka"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Linijinis"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Maišyti takelius"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Maišyti albumus"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Kartojimas"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Kartoti visus"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Kartoti vieną dainą"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "Nekartoti"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Slinkimas seka atkūrimą"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Žymeklis seka atkūrimą"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Sustabdyti po dabartinės dainos"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Peršokti į dabartinį takelį"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Žinynas"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Keitimų žurnalas"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Apie"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Vertėjai"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Ieškoti"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Stabdyti"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Groti"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pristabdyti"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Ankstesnis"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Sekantis"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Atsitiktinis grojimas"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Apie"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Išeiti"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Žinynas"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Takelio savybės"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "Prit_aikyti"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Užverti"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metaduomenys"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Savybės"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Pavadinimas:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Įveskite naujo stulpelio pavadinimą čia"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Tipas:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Elementų rodyklė"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Atkuriama"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Albumo dizainas"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Atlikėjas - Albumas"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Trukmė"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Takelio numeris"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Grupė / Albumo atlikėjas"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Formatas:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Lygiavimas:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Kairė"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Dešinė"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_Gerai"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Išvesties įskiepis:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Išvesties įrenginys:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "8 bitų audio visada konvertuoti į 16 bitų"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Garsas"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Garsinimo režimas:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Išjungti"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Takelis"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Garsinimo mastelis"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Pagarsinimo lygis:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Bendras pagarsinimas:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Į grojaraštį pridėti failus iš komandinės eilutės (ar failų tvarkyklės):"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Paleidus programą tęsti ankstesnę sesiją"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Prideant aplankus, nepridėti failų iš archyvų"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "Automatiškai atstatyti „Sustabdyti po dabartinės dainos“"
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Atkūrimas"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Konfigūruoti"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP Chain nustatymų rinkinys"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Įkelti"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Uždaryti į sistemos dėklą"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Nerodyti sistemos dėklo piktogramos"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "Įgalinti Rusiškos CP1251 koduotės aptikimą ir perkodavimą"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Įgalinti Kinietiškos CP936 koduotės aptikimą ir perkodavimą"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Sąsajos atnaujinimo dažnis (kartai per sekundę):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Pavadinimo juostos tekstas atkuriant:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Pavadinimo juostos tekstas sustabdžius:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 "Grafinės sąsajos įskiepis (pakeitimam įsigalioti, reikia paleisti iš naujo):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Kontekstiniame meniu nerodyti „Pašalinti iš disko“"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Pridedant tik vieną aplanką, grojaraštį pavadinti automatiškai"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "GUI/Kita"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Perrašyti"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Priekinis planas"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Fonas"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Prasukimo juostos/Garso juostos spalvos"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Vidurinis"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Šviesus"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Tamsus"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Bazinis"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Tekstas"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Kortelės spalvos"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Perašyti (bus prarasta GTK medžio peržiūra, bet pagreitės atvaizdavimas)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Lyginės eilutės"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Nelyginės eilutės"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Pasirinktos eilutės"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Pažymėtas tekstas"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Žymeklis"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Grojaraščio spalvos"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Spalvos"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Įjungti tarpinį serverį"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Tarpinis serveris:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Tarpinio serverio prievadas:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Tarpinio serverio tipas:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Tarpinio serverio naudotojo vardas:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Tarpinio serverio slaptažodis:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "HTTP naudotojo agentas:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Tinklas"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -882,122 +909,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Versija: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Autorinės teisės"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Įskiepiai"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Formatas"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Didėjantis"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Mažėjantis"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Pasirinkti DSP įskeipį"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Įskiepis"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Žymių rašymo nustatymai"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Rašyti ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Rašyti ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Rašyti APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Šalinti ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Šalinti ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Šalinti APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 versija"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Rekomenduojama)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 simbolių koduotė (numatyta iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Rašyti ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1005,91 +1038,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Atlikėjas / Albumas"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Takelio numeris"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Pridėti į atkūrimo eilę"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Pašalinti iš atkūrimo eilės"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Iš naujo įkelti meta duomenis"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Pašalinti iš disko"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Pridėti stulpelį"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Keisti stulpelį"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Pašalinti stulpelį"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Grupuoti pagal"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Nieką"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Atlikėjas/Data/Albumas"
 
@@ -1106,11 +1148,11 @@ msgstr "Konfigūruoti %s"
 msgid "Default Audio Device"
 msgstr "Numatytasis audio įrenginys"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1118,7 +1160,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Pridedami failai..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Inicializuojama..."
 
@@ -1131,128 +1173,128 @@ msgid "Really close the window?"
 msgstr "Tikrai užverti šį langą?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Keletas reikšmių]"
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Raktas"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Reikšmė"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Rašomos žymės..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Pavadinimas:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Laukelių vardai negali prasidėti: tarpu ar _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Pridėti laukelio nepavyko"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Laukelis su tokiu vardu jau yra, pabandykite kitą vardą."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Pridėti lauką"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Pašalinti lauką"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "Naudojimas: deadbeef [parinktys][failai]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Parinktys:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  ar  -h     Parodo pagalbos langą (šį) ir išeina\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Užverti grotuvą\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version     Parodyti versijos informaciją ir išeiti\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Atkūrti\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Sustabdyti\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Pristabdyti\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Perjungti sustabdymą\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr "   --play-pause       Jei sustabdyta atkurti, jei grojama sustabdyti\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Sekanti grojaraščio daina\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Ankstesnė grojaraščio daina\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Atsitiktinė daina grojaraštyje\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Pridėti failą(-us) į esamą grojaraštį\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
@@ -1260,12 +1302,12 @@ msgstr ""
 "   --gui ĮSKIEPIS       Nurodo kurį GUI įskiepį naudoti, numatytasis yra "
 "„GTK2“\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Nusiųsti formatuotą takelių sąrašą į stdout\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1276,7 +1318,7 @@ msgstr ""
 "                      [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 "                      copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1285,28 +1327,24 @@ msgstr ""
 "                     pvz.: --nowplaying \"%%a - %%t\" turėtų atvaizduoti "
 "„atlikėjas - pavadinimas“\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      plačiau http://sourceforge.net/apps/mediawiki/deadbeef/"
-"index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Numatyta"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Taip"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Ne"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1332,7 +1370,7 @@ msgstr ""
 "Grupė / Albumo atlikėjas\n"
 "Pasirinkta"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1340,7 +1378,7 @@ msgstr ""
 "Kairė\n"
 "Dešinė"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1350,7 +1388,7 @@ msgstr ""
 "Takelis\n"
 "Albumas"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1358,7 +1396,7 @@ msgstr ""
 "Mažėjančiai\n"
 "Didėjančiai"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1366,14 +1404,7 @@ msgstr ""
 "2.3 (Rekomenduojama)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Pixmap failo rasti nepavyko: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1385,8 +1416,8 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "Pridėti Audio CD"
+msgid "Add Audio CD"
+msgstr ""
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1678,8 +1709,8 @@ msgstr "Automatinis diskretizacijos dažnis (perrašo Paskirties dažnį)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
-msgstr "Konfigūruoti pasirinktines shell komandas"
+msgid "Configure Custom Shell Commands"
+msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
@@ -1695,35 +1726,40 @@ msgstr "Pirmenybę teikti Ken emu, o ne Satoh (erdvinis garsas neveiks)"
 msgid "Enable surround"
 msgstr "Įjungti erdvinį garsą"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Failas jau egzistuoja. Perrašyti?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Konverterio įspėjimas"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Prašome pasirinkti koduotoją"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Konverterio klaida"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Konvertuojama..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Pasirinkite aplanką..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Koduotojo nustatymų rinkinio išsaugoti nepavyko"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1731,77 +1767,77 @@ msgstr ""
 "Patikrinkite nustatymų rinkinio leidimus, pabandykite kitą pavadinimą ar "
 "atlaisvinkite diske vietos"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "Nustatymų rinkinys su tokiu vardu jau yra. Pasirinkite kitą vardą."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Klaida"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Pridėti naują koduotoją"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Keisti koduotoją"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Pašalinti nustatymų rinkinį"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Bus pašalintas pasirinktas nustatymų rinkinys. Ar jūs įsitikinę?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Koduotojai"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Į DSP grandinę pridėti įskiepį"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Naujo DSP nustatymų rinkinio išsaugoti nepavyko"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Naujas DSP nustatymų rinkinys"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Keisti DSP nustatymų rinkinį"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP nustatymų rinkiniai"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Paskirties aplankas:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr "Rašyti į takelio šaltinio aplanką"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr "Išlaikyti aplanko struktūrą"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Išvesties failas:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1811,89 +1847,89 @@ msgstr ""
 "Plėtinys (pvz. .mp3) bus pridėtas automatiškai.\n"
 "Jei paliksite tuščią laukelį, bus naudojamas numatytasis (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Koduotojas:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP nustatymų rinkinys:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Kopijų skaičius:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Išvesties pavyzdžio formatas:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Palikti šaltinio formatą"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 bit signed int"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 bit signed int"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 bit signed int"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 bit signed int"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 bit float"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Kai failas jau yra:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Paklausti"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Perrašyti"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Keisti koduotojo nustatymų rinkinį"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Nepavadintas koduotojas"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Išvesties failo plėtinys:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Pvz. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Komandinė eilutė:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1903,7 +1939,7 @@ msgstr ""
 "Pavyzdys: lame - %o\n"
 "%i įvesties failui, %o išvesties failui, - stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1913,66 +1949,72 @@ msgstr ""
 "<small>%o - išvesties failas\n"
 "%i - laikinas įvesties failas</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Metodas:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Kanalas"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Laikinas failas"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Žymių rašyklė</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "DSP nustatymų rinkinių redaktorius"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Nepavadintas DSP nustatymų rinkinys"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Pridėti"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Pixmap failo rasti nepavyko: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2010,27 +2052,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr "Pasirinktinės shell komandos"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "Keisti"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "Užverti"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "Keisti komandą"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "Komanda:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2041,17 +2083,17 @@ msgstr ""
 "Sutartinė shell komanda. Bus įvykdyta tokiam shell kontekste kokiame buvo "
 "paleista programa. Galima naudoti pavadinimo formatą. Pvz. xdg-open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "ID:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr "Laisva forma, pavyzdžiui „Mano shell komanda“"
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
@@ -2060,57 +2102,57 @@ msgstr ""
 "Komandos ID, tai turėtų būti kažkas trumpo, pvayzdžiui „youtube_atverti“. "
 "Negali kartotis."
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr "Pavieniai takeliai"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "Veikia su vienu takeliu."
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "Keletas takelių"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "Veikia su keliais takeliais."
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "Vietinis"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "Veikia su vietiniais failais."
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr "Nutolęs"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr "Veikia su nutolusiais failais (pvz. http:// streams)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "Elementas turėtų atsirasti pagrindiniame meniu"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2118,90 +2160,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Pridėti komandą"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "Pašalinti"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "Bus pašalinta pasirinkta shell komanda. Ar jūs įsitikinę?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr "Patvirtinti pašalinimą"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr "ID negali būti tuščias ar kartotis.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr "Pavadinimas negali būti tuščias.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr "Shell komanda negali būti tuščia.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "Netinkamos reikšmės"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2228,102 +2270,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 64692ca..ffcb9f4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/nl/)\n"
 "Language: nl\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Over DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s logboek van wijzigingen"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr ""
@@ -89,792 +89,819 @@ msgstr "Preamp op nul"
 msgid "Zero Bands"
 msgstr "Banden op nul"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Voorinstellingen"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dag %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dagen %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Gestopt | %d sporen | %s totale speeltijd"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Gepauzeerd | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d sporen | %s totale speeltijd"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Nieuwe speellijst"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nieuwe speellijst (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Fout bij het lezen van het hulpbestand"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Kon hulpbestand niet laden"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Bestand"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Open bestand(en)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Voeg bestand(en) toe"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Voeg map(pen) toe"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Voeg locatie toe"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Nieuwe speellijst"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Laad speellijst"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Speellijst opslaan"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Afsluiten"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Bewerken"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Wissen"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Selecteer alles"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Deselecteer alles"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Selectie omkeren"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Selectie"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Bijsnijden"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Zoeken"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Titel"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Spoornummer"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Artiest"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Datum"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Willekeurig"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Aangepast"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Beeld"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Statusbalk"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Afspelen"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Ordenen"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Lineair"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Sporen schuffelen"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Albums schuffelen"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Herhalend"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Bladeren volgt afspelen"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Aanwijzer volgt afspelen"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Stop na huidig"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Spring naar huidige spoor"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Logboek van wijzigingen"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Over"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Vertalers"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Stoppen"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Afspelen"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pauzeren"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Vorige"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Volgende"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Willekeurig afspelen"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Over"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Hulp"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Eigenschappen van spoor"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Toepassen"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Bijkomende gegevens"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Voer hier een nieuwe kolomtitel in"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Type:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Index van elementen"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Aan het afspelen"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Albumkunst"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Artiest - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Duur"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Spoornummer"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Groep / Album Artiest"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Opmaaktype:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Uitlijning:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Links"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Rechts"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Annuleer"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Uitvoerplugin:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Uitvoerapparaat:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "8-bit-audio altijd omzetten naar 16-bit"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Geluid"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Replaygain modus:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Spoor"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Replaygain piek schaal"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Replaygain voorversterking:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Voeg bestanden toe vanaf de opdrachtregel (of met de bestandbeheerder) aan "
 "deze speellijst:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Hervat vorige sessie bij opstarten"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Niet toevoegen vanuit archieven bij het toevoegen van mappen"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Afspelen"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Configureer"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP Chain voorinstelling"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Laden"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Sluiten minimaliseert naar systeemvak"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Verberg systeemvakpictogram"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Verversingssnelheid van gebruikersschil (keren per seconde):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Titelbalktekst gedurende afspelen:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Titelbalktekst wanneer gestopt:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "GUI Plugin (wijzigen vereist herstart)"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Verberg \"Verwijder van schijf\"-element in het contekstmenu"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 "Geef speellijsten automatisch een naam bij het toevoegen van een enkele map"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Negeer"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Voorgrond"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Achtergrond"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Kleuren zoekbalk/volumebalk"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Midden"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Licht"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Donker"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Basis"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Tekst"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Tabstrook-kleuren"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Negeer (geen boomstructuurthema, maar snellere weergave)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Even rij"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Oneven rij"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Geselecteerde rij"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Geselecteerde tekst"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Aanwijzer"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Speellijst-kleuren"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Kleuren"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Schakel Proxy Server in"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Proxy Server adres:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Proxy Server poort:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Proxy type:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Proxy gebruikersnaam:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Proxy wachtwoord:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Netwerk"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -882,122 +909,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Versie: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Auteursrecht"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Opmaaktype:"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Oplopend"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Aflopend"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Selecteer DSP-plugin"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Instellingen van etiketschrijver"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "ID3v2 schrijven"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "ID3v1 schrijven"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "APEv2 schrijven"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "ID3v2 verwijderen"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "ID3v1 verwijderen"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "APEv2 verwijderen"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 versie"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (aangeraden)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 tekencodering (standaard is iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 schrijven"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1005,91 +1038,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Artiest / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Spoornr."
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Aan de speelwachtrij toevoegen"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Uit speelwachtrij verwijderen"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Herlaad bijkomende gegevens"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Verwijder van schijf"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Kolom toevoegen"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Kolom bewerken"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Kolom verwijderen"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Groeperen op"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Geen"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Artiest/Datum/Album"
 
@@ -1106,11 +1148,11 @@ msgstr "Configureer %s"
 msgid "Default Audio Device"
 msgstr "Standaard geluidapparaat"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1118,7 +1160,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Bestanden aan het toevoegen..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Aan het initialiseren..."
 
@@ -1131,140 +1173,140 @@ msgid "Really close the window?"
 msgstr "Dit venster echt sluiten?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Meerdere waarden] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Toets"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Waarde"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Etiketten aan het schrijven..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Naam:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Veldnamen moeten niet beginnen met : of _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Kan veld niet toevoegen"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Veld met deze naam bestaat reeds, probeer a.u.b. andere naam."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Voeg veld toe"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Verwijder veld"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Opties:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  or  -h     Drukt hulp af (dit bericht) en sluit af\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Speler afsluiten\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version       Versie-informatie afdrukken en sluiten\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play         Afspelen beginnen\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop         Afspelen stoppen\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause         Afspelen pauzeren\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Pauze schakelen\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 "   --play-pause       Begin afspelen indien gestopt, anders pauze schakelen\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next         Volgend nummer in speellijst\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev         Vorig nummer in speellijst\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random         Willekeurig nummer in speellijst\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue         Bestand(en) toevoegen aan speellijst\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Afdrukken geformatteerde spoornaam naar stdout\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1275,7 +1317,7 @@ msgstr ""
 "                      [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 "                      copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1284,28 +1326,24 @@ msgstr ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      voor meer infor, zie http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Standaard"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Ja"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Nee"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1331,7 +1369,7 @@ msgstr ""
 "Groep / Album Artiest\n"
 "Aangepast"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1339,7 +1377,7 @@ msgstr ""
 "Links\n"
 "Rechts"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1349,7 +1387,7 @@ msgstr ""
 "Spoor\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1357,7 +1395,7 @@ msgstr ""
 "Oplopend\n"
 "Aflopend"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1365,14 +1403,7 @@ msgstr ""
 "2.3 (Aangeraden)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Kon geen pixmapbestand vinden: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1385,7 +1416,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1679,7 +1710,7 @@ msgstr "Automatische Samplerate (negeert Doel-Samplerate)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1696,35 +1727,40 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Het bestand bestaat al. Overschrijven?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Waarschuwing van omzetter"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Kies a.u.b. een codeerder"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Fout van omzetter"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Bezig met omzetten..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Selecteer map..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Kon codeerder-voorinstelling niet opslaan"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1732,79 +1768,79 @@ msgstr ""
 "Controleer de maprechten voor voorinstelling, probeer een andere titel te "
 "kiezen, of maak wat schijfruimte vrij"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 "Voorinstelling met dezelfde naam bestaat al. Probeer een andere titel te "
 "kiezen."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Fout"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Voeg nieuwe codeerder toe"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Codeerder bewerken"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Verwijder voorinstelling"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Dit zal de geselecteerde voorinstelling verwijderen. Weet u het zeker?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Codeerders"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Voeg plugin toe aan DSP-ketting"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Kon DSP-voorinstelling niet opslaan"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Nieuwe DSP-voorinstelling"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "DSP-voorinstelling bewerken"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP-voorinstellingen"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Uitvoermap:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Naam van uitvoerbestand:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1814,89 +1850,89 @@ msgstr ""
 "Extensie (bijv. .mp3) zal automatisch worden toegevoegd.\n"
 "Laat het veld leeg voor standaard (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Codeerder:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP-voorinstelling:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Aantal draadjes:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Bestandtype van uitvoer-voorbeeld:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Behoud bronbestandtype"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 bit signed int"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 bit signed int"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 bit signed int"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 bit signed int"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 bit float"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Wanneer het bestand bestaat:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Vraag bevestiging"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Overschrijf"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Bewerk voorinstelling van codeerder"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Naamloze codeerder"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Extensie van uitvoerbestand:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Bijv. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Opdrachtregel:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1906,7 +1942,7 @@ msgstr ""
 "Voorbeeld: lame - %o\n"
 "%i voor invoerbestand, %o voor uitvoerbestand, - for stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1916,66 +1952,72 @@ msgstr ""
 "<small>%o - uitvoerbestandnaaam\n"
 "%i - tijdelijke invoerbestandnaam</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Methode:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Pijp"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Tijdelijk bestand"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Etiketschrijver</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "DSP voorinstellingbewerker"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Naamloze DSP voorinstelling"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Toevoegen"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Kon geen pixmapbestand vinden: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2013,27 +2055,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2042,74 +2084,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2117,90 +2159,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2227,102 +2269,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index e536cfc..f722b92 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,17 +5,20 @@
 # Translators:
 # Grzegorz Gibas <amigib at gmail.com>, 2010
 # Łukasz Jasiński <alvarus at alvarus.org>, 2010
-# mati75 <mati75 at linuxmint.pl>, 2013
+# Mateusz Łukasik <mati75 at linuxmint.pl>, 2013-2014
+# Mateusz Łukasik <mati75 at linuxmint.pl>, 2013
 # Piotr Sokół <psokol at jabster.pl>, 2010
-# RyD0pR3c <prendter at gmail.com>, 2013
-# RyD0pR3c <prendter at gmail.com>, 2013
+# Tazik_85 <inactive+Tazik_85 at transifex.com>, 2014
+# Zetok <prendter at gmail.com>, 2013
+# Tazik_85 <inactive+Tazik_85 at transifex.com>, 2014
+# Zetok <prendter at gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-23 13:40+0000\n"
-"Last-Translator: mati75 <mati75 at linuxmint.pl>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/pl/)\n"
 "Language: pl\n"
@@ -25,17 +28,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "O programie DeaDBeef %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Lista zmian w DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Tłumacze"
@@ -92,46 +95,46 @@ msgstr "Wyzeruj Preamp"
 msgid "Zero Bands"
 msgstr "Wyzeruj pojedyncze"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Zapisz ustawienia..."
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dzień %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dni %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr ""
 "Zatrzymano odtwarzanie | %d ścieżek | całkowity czas trwania listy "
 "odtwarzania: %s"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kb/s "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Wstrzymano odtwarzanie |"
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -139,748 +142,773 @@ msgstr ""
 "%s%s %s| %d Hz | %d bitów | %s | %d:%02d / %s | %d ścieżek | całkowity czas "
 "trwania listy odtwarzania: %s"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Nowa lista odtwarzania"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nowa lista odtwarzania (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Playlisty z kartami"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Playlista"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "Podziałka (góra i dół)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "Podziałka (lewo i prawo)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "Karty playlist"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Właściwości zaznaczenia"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Wyświetlanie okładki albumu"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "Zakres"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
-msgstr ""
+msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
-msgstr ""
+msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Przycisk"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Nie można odczytać pliku pomocy"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Wystąpił błąd przy wczytywaniu pliku pomocy"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
-"Odtwarzacz obecnie wykonuje zadania w tle. Jeśli wyjdziesz teraz, zadania "
-"zostaną anulowane lub przerwane. Może to skutkować utratą danych."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "Czy wciąż chcesz wyjść?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Plik"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Otwórz..."
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Dodaj..."
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Dodaj katalog..."
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Dodaj położenie..."
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Nowa lista odtwarzania"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Wczytaj listę odtwarzania..."
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Zapisz listę odtwarzania"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "Wy_czyść"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Zaznacz wszystkie"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Odznacz wszystkie"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Odwróć zaznaczenie"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Zaznaczenie"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Usuń"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Usuń pozostałe"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Znajdź"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Sortuj według"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Tytuł"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Numer utworu"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Wykonawca"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Data"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Losowo"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Własny"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Widok"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Pasek stanu"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Korektor dźwięku"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "Tryb projektowania"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "Odtwarzanie"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Kolejność"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Liniowa"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Tasuj ścieżki"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Tasuj albumy"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Powtarzanie"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Zapętl wszystko"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Zapętl pojedynczą piosenkę "
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "Nie zapętlaj"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Przewijanie podąża za odtwarzaniem"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Kursor podąża za odtwarzaniem"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Zatrzymaj po bieżącym utworze"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Przejdź do bieżącego nagrania"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "Lista zmian"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "O progr_amie"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Tłumacze"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Szukaj"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Odtwarzaj"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Następny"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Odtwarzaj losowo"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "O programie"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Zakończ"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Właściwości utworu"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "Lokalizacja:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "Z_astosuj"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "Zamknij"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadane"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Właściwości"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Wpisz nową nazwę kolumny"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Numer ścieżki"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Odtwarzanie"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Okładka albumu"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Wykonawca - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Długość"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Numer utworu"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Wykonawca albumu"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Wyrównanie:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Lewo"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Prawo"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "An_uluj"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Wtyczka wyjścia:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Urządzenie wyjścia:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Zawsze konwertuj 8 bitowe audio do 16 bitowego"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Zawsze konwertuj 16 bitowe audio do 24 bitowego"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Tryb Replaygain:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Numer utworu"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Szczyt skali Replaygain"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Przedwzmacniacz replaygain:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Przedwzmacniacz powszechny"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "Domyślna lista odtwarzania:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Wznowienie odtwarzania po uruchomieniu programu"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Nie dodawaj z archiwów podczas dodawania folderów"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "Automatycznie resetuj \"Zatrzymaj po bieżącym utworze\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Odtwarzanie"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Konfiguracja"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Ładuj"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Ukrywanie okna do obszaru powiadamiania zamiast zamykania"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Ukrycie ikony obszaru powiadamiania"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "Detekcja i zapisywanie Rosyjskiego CP1251"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Detekcja i zapisywanie Chińskiego CP936"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Częstotliwość odświeżania interfejsu (w ciągu sekundy):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Zawartość paska tytułu podczas odtwarzania:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Zawartość paska tytułu po zatrzymaniu odtwarzania:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 "Wtyczka interfejsa graficznego (zmiana potrzebuje uruchomienia ponowia)"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr "Odtwarzacz"
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Zamknij listy odtwarzania środkowym klawiszem myszy"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
-msgstr ""
+msgstr "Wyświetlaj aktualnie odtwarzany utwór pogrubioną czcionką"
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Ukrycie polecenia „Usuń pliki z dysku” w menu podręcznym"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Automatycznie nazywaj playlisty podczas dodawania pojedynczego folderu"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "Automatycznie dopasuj szerokość kolumn do rozmiaru okna"
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "GUI/Różne"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Własne"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Pierwszoplanowy"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Drugoplanowy"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Pasek przewijania i głośności"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Środkowy"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Jasny"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Ciemny"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Baza"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Tekst"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Karty"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Podmień (traci motyw GTK treeview, ale przyspiesza renderowanie)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Parzysty wiersz"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Nieparzysty wiersz"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Zaznaczony wiersz"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Zaznaczony tekst"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Kursor"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Listy odtwarzania"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Kolory"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Serwer pośredniczący"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Adres:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Port:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Nazwa użytkownika:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Hasło:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr "Edytuj mapowanie typu zawartości"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Sieć"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr "Przydzielone skróty klawiszowe:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr "Działanie:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr "<Not set>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr "Kombinacja klawiszy:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "Globalne skróty klawiszowe"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -888,122 +916,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr "_Domyślne"
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "Skróty klawiszowe"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Wersja:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Prawa autorskie"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "Grupuj według ..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "Sortuj według ..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Format"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Wzrastająco"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Malejąco"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Wybieraj wtyczkę DSP"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Wtyczki"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Ustawienia edytora tagów"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Zapisywanie ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Zapisywanie ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Zapisywanie APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Usuwanie ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Usuwanie ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Usuwanie APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Wersja ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (rekomendowana)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Kodowanie znaków ID3v1 (domyślnie iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Zapisywanie ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr "Mapowanie typu zawartości"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1011,91 +1045,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr "Zresetuj do domyślnych"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr "Typ zawarotści:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "Wtyczki:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr "Właściwości przycisku"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr "Kolor:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr "Kolor tekstu:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr "Ikona:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr "Etykieta:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr "Wybierz działanie"
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Wykonawca / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Numer ścieżki"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Dodaj do kolejki"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Usuń z kolejki"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Wczytaj ponownie metadane"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Usuń z dysku"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Dodaj kolumnę"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Edytuj kolumnę"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Usuń kolumnę"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Grupowanie"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Brak"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Artysta/Data/Album"
 
@@ -1112,19 +1155,19 @@ msgstr "Konfiguruj %s"
 msgid "Default Audio Device"
 msgstr "Domyślne urządzenie dźwiękowe"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr ""
+msgstr "Zmodyfikowałeś skróty klawiszowe, ale nie zapisałeś zmian."
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
-msgstr ""
+msgstr "Kontynuować bez zapisywania zmian?"
 
 #: ../plugins/gtkui/progress.c:56
 msgid "Adding files..."
 msgstr "Dodawanie plików..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Inicjalizowanie..."
 
@@ -1137,131 +1180,131 @@ msgid "Really close the window?"
 msgstr "Zamknąć okno?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Wiele wartości]"
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Typ"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Wartość"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[Wiele wartości]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Zapisywanie tagów..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "Nazwa pola"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Imię:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Nazwa nie może zaczynać się od : lub _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Nie można dodać pola"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Pole o takiej nazwie już istnieje, proszę spróbować innej nazwy."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Dodaj..."
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Usuń"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "Użycie: deadbeef [opcje] [--] [plik(i)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Opcje:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr ""
 "   --help  lub  -h     Wyświetla pomoc (ten tekst) i wychodzi z programu\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Wychodzi z programu\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Wyświetla wersję programie i wychodzi\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Zaczyna odtwarzanie\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Zatrzymuje odtwarzanie\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Wstrzymuje odtwarzanie\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Włącz-wyłącz pauzę\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 "   --play-pause       Odtwarzaj jeśli zatrzymane, w innym wypadku pauzuj\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Następny utwór na liście odtwarzania\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Poprzedni utwór na liście odtwarzania\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Losowy utwór na liście odtwarzania\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr ""
 "   --queue            Dodaje plik(i) do istniejącej listy odtwarzania\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
@@ -1269,12 +1312,12 @@ msgstr ""
 "   --gui WTYCZKA       Wybiera której wtyczki GUI użyć, domyślną jest "
 "\"GTK2\"\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Wysyła sformatowaną nazwę utworu do stdout\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1285,7 +1328,7 @@ msgstr ""
 "                      [d]ługość, [n]umer utworu, [r]ok, [k]omentarz,\n"
 "                      prawa auto[r]skie, [e]pozostało\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1294,28 +1337,24 @@ msgstr ""
 "                      np.: --nowplaying \"%%a - %%t\" powinno wyświetlić "
 "\"artysta - tytuł\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      więcej informacji na http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Domyślne"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Tak"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Nie"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1341,7 +1380,7 @@ msgstr ""
 "Zespół / Wykonawca albumu\n"
 "Własny"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1349,7 +1388,7 @@ msgstr ""
 "Lewo\n"
 "Prawo"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1359,7 +1398,7 @@ msgstr ""
 "Utwór\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1367,7 +1406,7 @@ msgstr ""
 "Wzrastająco\n"
 "Malejąco"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1375,14 +1414,7 @@ msgstr ""
 "2.3 (Rekomendowany)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Nie można znaleźć pliku pixmapy: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1395,8 +1427,8 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "Dodaj audio CD"
+msgid "Add Audio CD"
+msgstr ""
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1691,8 +1723,8 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
-msgstr "Konfiguruj własne polecenia shell"
+msgid "Configure Custom Shell Commands"
+msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
@@ -1708,112 +1740,117 @@ msgstr ""
 msgid "Enable surround"
 msgstr "Włącz dźwięk przestrzenny"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Plik już istnieje. Nadpisać?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Ostrzerzenie konwertera"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Wybierz enkoder"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Błąd konwertera"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Konwertowanie..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Wybierz folder..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Błąd"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Dodaj nowy enkoder"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Edytuj enkoder"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Usuń ustawienie"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 "Ta czynność spowoduje usunięcie wybranego ustawienia. Czy jesteś pewien?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Enkodery"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Dodaj wtyczkę do łańcucha DSP"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Błąd zapisu ustawień DSP"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Nowe ustawienia DSP"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Edytuj ustawienia DSP"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "Ustawienia DSP"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Folder wyjściowy:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr "Zapisz do folderu źródłowego ścieżki"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr "Zachowaj strukturę folderu"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Nazwa pliku wyjściowego"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1823,89 +1860,89 @@ msgstr ""
 "Rozszerzenie (np. .mp3) będzie dodane automatycznie.\n"
 "Pozostaw to pole dla domyślnego (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Enkoder:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "Ustawienie DSP:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Ilość wątków:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Wyjściowa częstotliwość próbkowania formatu:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Zachowaj format źródłowy"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr ""
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Jeśli plik istnieje:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Pytaj"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Nadpisz"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Nienazwany enkoder"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Rozszerzenie pliku wyjściowego:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Np. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Linia poleceń:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1915,7 +1952,7 @@ msgstr ""
 "Przykład: lame - %o\n"
 "%i dla pliku wejściowego, %o dla pliku wyjściowego, - dla stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1925,66 +1962,72 @@ msgstr ""
 "<small>%o - nazwa pliku wyjściowego\n"
 "%i - tymczasowa nazwa pliku wejściowego</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Metoda:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Plik tymczasowy"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
-msgstr ""
+msgstr "Edytor ustawień DSP"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Dodaj"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nie można znaleźć pliku pixmapy: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2014,27 +2057,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr "Własne komendy Shell"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "Edytuj"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "Zamknij"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "Edytuj komendę"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "Komenda:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2046,17 +2089,17 @@ msgstr ""
 "została uruchomiona aplikacja. Formatowanie tytułu może zostać użyte. "
 "Przykład: xdg-open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "ID:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
@@ -2065,57 +2108,57 @@ msgstr ""
 "ID komendy, zazwyczaj powinno być to coś krótkiego, na przykład "
 "\"otwórz_youtube\". Musi być unikalne."
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr "Pojedyncze ścieżki"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "Działa na pojedynczej ścieżce."
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "Wiele ścieżek"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "Działa na wielu ścieżkach"
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "Lokalnie"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "Działa na plikach lokalnych."
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr "Zdalnie"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr "Działa na zdalnych plikach (np. http:// streams)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "Pozycja powinna pojawić się w głównym menu"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2123,72 +2166,72 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Dodaj komendę"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "Usuń"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "To działanie usunie wybraną komendę shell. Czy na pewno to zrobić?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr "Potwierdzenie usunięcia"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr "ID musi coś zawierać i być unikalne.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr "Tytył musi coś zawierać.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr "Komenda shell musi coś zawierać.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "Nieprawidłowe wartości"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr "Wspierane formaty dźwięku"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "Wszystkie pliki (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr "Otwórz plik(i)..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr "Dodaj plik(i) do playlisty..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr "Dodaj katalog(i) do playlisty..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
-msgstr ""
+msgstr "Podążaj za dowiązaniami symbolicznymi"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "Usuń pliki z dysku"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -2196,19 +2239,19 @@ msgstr ""
 "Pliki zostaną utracone. Kontynuować?\n"
 "(Ten dialog może zostać wyłączony w ustawieniach wtyczki GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "Wczytaj Playlistę"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "Inne pliki (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr "Zapisz playlistę jako"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Plik playlisty DeaDBeeF (*.dbpl)"
 
@@ -2235,102 +2278,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr "Nic nie wybrano."
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr "Zastąp..."
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
-msgstr ""
+msgstr "Wstaw..."
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr "Wytnij"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr "Wklej"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr "Blokada ruchu"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr "Przesuń kartę w lewo"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr "Przesuń kartę w prawo"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr "Usuń kartę"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr "Zmień nazwę karty"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr "Dodaj nową kartę"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr "Pokaż nagłówki kolumn"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr "Homogeniczny"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr "Rozszerz"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr "Wypełnij"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr "Konfiguruj przycisk"
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr "Edytuj playlistę"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr "Zmień nazwę playlisty"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr "Usuń playlistę"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr "Dodaj nową playlistę"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr "Przeglądarka playlisty"
diff --git a/po/pt.po b/po/pt.po
index fb476f9..3a3e3f7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Sérgio Marques <smarquespt at gmail.com>, 2013
+# Sérgio Marques <smarquespt at gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 21:02+0000\n"
 "Last-Translator: Sérgio Marques <smarquespt at gmail.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/deadbeef-"
 "player/language/pt/)\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Sobre o DeaDBeef %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Alterações no DeaDBeef %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Tradutores do DeaDBeeF"
@@ -86,793 +86,820 @@ msgstr "Amplificador nulo"
 msgid "Zero Bands"
 msgstr "Bandas nulas"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Pré-ajustes"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dia %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dias %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Parado | %d faixas | %s reproduções"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Em pausa | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d faixas | %s reproduções"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Nova lista de reprodução"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nova lista de reprodução (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Lista de reprodução com separadores"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Lista de reprodução"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "Separador (superior e inferior)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "Separador (esquerda e direita)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "Separadores de lista de reprodução"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Propriedades da seleção"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Imagem do álbum"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "Scope"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "Espetro"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Botão"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr "Barra de procura"
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr "Controlos de reprodução"
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr "Barra de volume"
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Falha ao abrir a ajuda"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Falha ao carregar a ajuda"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
-"A aplicação está a ser executada em segundo plano. Se a fechar, as tarefas "
-"serão canceladas e interrompidas. Pode perder dados."
+"A aplicação está a executar ações em segundo plano. Se sair agora, as "
+"tarefas serão canceladas ou interrompidas. Poderá provocar a perda de dados."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "Quer mesmo sair?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "Abrir ficheir_o(s)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Adicionar ficheiro(s)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Adicionar pasta(s)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Adicionar local"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Nova lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Carregar lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Gravar lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Marcar tudo"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Desmarcar tudo"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Inverter seleção"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Seleção"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Remover"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Cortar"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Procurar"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Ordenar por"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Título"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Número de faixa"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Álbum"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Artista"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Data"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Aleatório"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Personalizar"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Ver"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Barra de estado"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Equalizador"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "Modo de desenho"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "Re_produção"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Organização"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Linear"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Desordenar faixas"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Desordenar álbuns"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Repetição"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Repetir tudo"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Repetir uma faixa"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "Não repetir"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Deslocamento segue a reprodução"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Cursor segue a reprodução"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
 msgstr "Parar após a faixa atual"
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr "Parar após o álbum atual"
+
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Ir para a faixa atual"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Alterações"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Tradutores"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Procurar"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Parar"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Reproduzir"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Reprodução aleatória"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Sobre"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Sair"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Propriedades da faixa"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "Localização:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Definições"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "Fe_char"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Detalhes"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Propriedades"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Título:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Indique o novo título da coluna"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Índice de itens"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Reprodução"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Capa do álbum"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Artista - Álbum"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Duração"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Número da faixa"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Banda/Artista do álbum"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Alinhamento:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Direita"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "C_onfirmar"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Sistema de som:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Dispositivo de som:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Converter áudio 8 bits para 16 bits"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Converter áudio 16 bits para 24 bits"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Som"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Modo Replay Gain:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Desativar"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Faixa"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Escala Replay Gain"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Amplificador Replaygain:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Amplificador:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Adicionar ficheiros via linha de comandos (ou gestor de ficheiros) para esta "
 "lista de reprodução:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Retomar sessão anterior ao iniciar"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Ao adicionar pastas não adicionar arquivos"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr ""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr "A opção \"Parar após a faixa atual\" será desligada após a ativação"
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr "A opção \"Parar após o álbum atual\" será desligada após a ativação"
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Reprodução"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Configurar"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Pré-ajustes DSP"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "Carr_egar"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Fechar minimiza para a área de notificação"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Ocultar ícone da área de notificação"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "Ativar deteção e codificação de SHIFT-JIS japonês"
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "Ativar deteção e codificação de Russo CP1251"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Ativar deteção e codificação de Mandarim CP936"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Taxa de atualização da interface (vezes por segundo):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Barra de título ao reproduzir:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Barra de título se parada:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Extra da interface (tem que reiniciar):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr "Reprodutor"
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr "Fechar lista de reprodução com a roda do rato"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr "Utilizar letra a negrito para a faixa em reprodução"
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Ocultar item de menu \"Eliminar do disco\""
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr "Ocultar item de menu \"Remover do disco\""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Ao adicionar uma pasta dar nome às listas de reprodução"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr "Ajustar colunas para caber na janela"
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "Interface/Outras"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Sobrepor"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Principal"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Secundária"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Cor das barras de volume/procura"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Normal"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Claro"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Escuro"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Texto"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Cores do separador"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Sobrepor (perde a vista em árvore mas acelera o processamento)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Linha par"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Linha ímpar"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Linha selecionada"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Texto selecionado"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Cursor"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Cores da lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Cores"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Ativar servidor proxy"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Endereço do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Porta do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Tipo de proxy:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Utilizador do proxy:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Senha do proxy:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "Agente HTTP:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr "Editar mapeamento de tipo de conteúdo"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Rede"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr "Atalhos atribuídos:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr "Ação:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr "<Não definido>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr "Combinação de teclas:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "Tecla de atalho global"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -884,122 +911,128 @@ msgstr ""
 "As alterações não serão gravadas\n"
 "se não premir Aplicar."
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr "Pré-_definições"
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "Teclas de atalho"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Versão:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Direitos de autor"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Extras"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr "Definir título personalizado"
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "Agrupar por..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "Ordenar por..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Formato"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Descendente"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Selecione o extra DSP"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Extra"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Definições do editor de detalhes"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Gravar ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Gravar ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Gravar APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Remover ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Remover ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Remover APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Versão ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Recomendado)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Codificação de caracteres ID3v1 (por definição é iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Gravar ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr "Mapeamento de tipo de conteúdo"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1011,91 +1044,106 @@ msgstr ""
 "\" e precisam de ser descodificados pelo extra \"stdmpg\" ou pelo extra "
 "\"ffmpeg\"."
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr "Restaurar definições originais"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr "Tipo de conteúdo:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "Extras:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr "Propriedades do botão"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr "Cor:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr "Cor do texto:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr "Ícone:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr "Etiqueta:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr "Escolha a ação"
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+"Este diálogo permite-lhe definir um título personalizado para qualquer "
+"faixa. Pode ser útil para estações de rádio. A opção para definir o título "
+"personalizado também está disponível no diálogo \"Adicionar localização\". O "
+"título estará visível na coluna \"Artista\". Deverá aparecer \"artista "
+"[personalizado]\" se o campo Artista estiver presente e se não estiver "
+"aparece \"personalizado\"."
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Artista/Álbum"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Faixa n.º"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
 msgstr "Adicionar à fila de reprodução"
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
 msgstr "Remover da fila de reprodução"
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Recarregar detalhes"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr "Recarregar meta-dados"
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
 msgstr "Remover do disco"
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Adicionar coluna"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Editar coluna"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Remover coluna"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr "Fixar grupos as deslocar"
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Agrupar por"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Nada"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Artista/Data/Álbum"
 
@@ -1112,11 +1160,11 @@ msgstr "Configurar %s"
 msgid "Default Audio Device"
 msgstr "Dispositivo áudio pré-definido"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr "Modificou as teclas de atalho mas não gravou as alterações."
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr "Tem a certeza que quer continuar e não gravar?"
 
@@ -1124,7 +1172,7 @@ msgstr "Tem a certeza que quer continuar e não gravar?"
 msgid "Adding files..."
 msgstr "Adição de ficheiros..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "A iniciar..."
 
@@ -1137,104 +1185,104 @@ msgid "Really close the window?"
 msgstr "Fechar esta janela?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Vários valores]"
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Tecla"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Valor"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[Vários valores]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "A escrever detalhes..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "Nome do campo"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Os nomes não podem iniciar com : ou _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Incapaz de adicionar campo"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Já existe um campo com este nome. Tente um nome diferente."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Adicionar campo"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Remover campo"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "Utilização: deadbeef [opções] [--] [ficheiro(s)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Opções:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  ou  -h     Mostra a ajuda (esta mensagem) e sai\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Sai do DeadBeeF\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr ""
 "   --version          Mostra a versão e sai\n"
 "\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Inicia a reprodução\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Para a reprodução\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Pausa a reprodução\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Retomar/Pausar\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1242,27 +1290,27 @@ msgstr ""
 "   --play-pause       Inicia reprodução se parado, caso contrário coloca em "
 "pausa\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Avança uma faixa\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Recua uma faixa\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Faixa aleatória da lista\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Junta os ficheiros à lista existente\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
@@ -1270,12 +1318,12 @@ msgstr ""
 "   --gui PLUGIN       Indica a interface a utilizar, por definição \"GTK2\"\n"
 "\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Grava o nome da faixa para stdout\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1286,7 +1334,7 @@ msgstr ""
 "                      [l]duração, [n]úmerodafaixa, [y]ano, [c]omentário,\n"
 "                      di[r]eitosdeautor, d[e]corrido\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1296,28 +1344,24 @@ msgstr ""
 "\"artista - título\"\n"
 "\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
-msgstr ""
-"                      para mais informações, consulte http://sourceforge.net/"
-"apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
+msgstr "para mais informações, consulte %s\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Pré-definida"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Sim"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Não"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1343,7 +1387,7 @@ msgstr ""
 "Banda / Artista do álbum\n"
 "Personalizar"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1351,7 +1395,7 @@ msgstr ""
 "Esquerda\n"
 "Direita"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1361,7 +1405,7 @@ msgstr ""
 "Faixa\n"
 "Álbum"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1369,7 +1413,7 @@ msgstr ""
 "Ascendente\n"
 "Descendente"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1377,14 +1421,7 @@ msgstr ""
 "2.3 (Recomendado)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Incapaz de encontrar o ficheiro: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1397,8 +1434,8 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "Adicionar CD"
+msgid "Add Audio CD"
+msgstr "Adicionar CD áudio"
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1690,8 +1727,8 @@ msgstr "Frequência automática (substitui frequência final)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
-msgstr "Configurar comandos de consola"
+msgid "Configure Custom Shell Commands"
+msgstr "Configurar comando de consola personalizados"
 
 #. mpgmad
 #: ../translation/extra.c:99
@@ -1707,112 +1744,117 @@ msgstr "Preferir Ken emu a Satoh (surround não funciona)"
 msgid "Enable surround"
 msgstr "Ativar \"surround\""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr "[Nativo] %s"
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "O ficheiro já existe. Substituir?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Aviso de conversão"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Por favor escolha o codificador"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Erro de conversão"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "A converter..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Selecione a pasta..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Falha ao gravar definições do codificador"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 "Verifique as permissões, escolha um nome diferente ou liberte espaço em disco"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "Já existe um pré-ajuste com este nome. Escolha outro nome."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Erro"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Adicionar novo codificador"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Editar codificador"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Remover pré-ajuste"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Esta ação eliminará o pré-ajuste selecionado. Tem a certeza?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Codificadores"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Adicionar extra à cadeia DSP"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Falha ao gravar as definições DSP"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Novo pré-ajuste DSP"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Editar pré-ajuste DSP"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "Pré-ajustes DSP"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Pasta de destino:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr "Gravar na pasta do ficheiro original"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr "Manter estrutura da pasta"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Nome do ficheiro:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1822,89 +1864,89 @@ msgstr ""
 "A extensão (ex: mp3) será adicionada automaticamente.\n"
 "Deixe o campo vazio para utilizar (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Codificador:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "Pré-ajuste DSP:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Número de processos:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Formato de destino:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Manter formato original"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 bit signed int"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 bits signed int"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 bits signed int"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 bits signed int"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 bits float"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Se o ficheiro existir:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Perguntar"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Substituir"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Editar definições do codificador"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Codificador sem nome"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Extensão do ficheiro de destino:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Ex. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Linha de comandos:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1914,7 +1956,7 @@ msgstr ""
 "Exemplo: lame - %o\n"
 "%i para o ficheiro de origem, %o para o ficheiro de destino, - para stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1924,66 +1966,72 @@ msgstr ""
 "<small>%o - nome do ficheiro de destino\n"
 "%i - nome do ficheiro temporário</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Método:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Canal"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Ficheiro temporário"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Editor de detalhes</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "Editor de DSP"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Pré-ajuste DSP sem nome"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Adicionar"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Incapaz de encontrar o ficheiro: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2021,27 +2069,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr "Comandos personalizados"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "Editar"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "Fechar"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "Editar comando"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "Comando:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2052,17 +2100,17 @@ msgstr ""
 "Comando de consola aleatório. Será executado na consola em que a aplicação "
 "for iniciada. Pode utilizar a formatação de título. Exemplo: xdg-open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "ID:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr "Nome livre. Por exemplo: \"Os meus comandos\""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
@@ -2070,57 +2118,57 @@ msgid ""
 msgstr ""
 "ID do comando. Deve ser algo curto e único. Por exemplo \"youtube_open\". "
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr "Faixa única"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "Funciona para uma faixa."
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "Várias faixas"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "Funciona para várias faixas."
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "Local"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "Funciona com ficheiros locais."
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr "Remoto"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr "Funciona com ficheiros remotos (emissões)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr "Genérico (menu principal)"
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "Item deve aparecer no menu principal"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2131,72 +2179,72 @@ msgstr ""
 "título contém o caminho desta forma: \"Ficheiro/Meu comando\", em que "
 "Ficheiro é o nome do menu na versão em inglês.</small>"
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Adicionar comando"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "Esta ação eliminará o comando de consola. Tem a certeza?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr "Confirmação"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr "ID não pode estar vazia e deve ser exclusiva.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr "Título não pode estar vazio.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr "Comando de consola não pode estar vazio.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "Valores inválidos"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr "Formatos suportados"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "Todos os ficheiros (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr "Abrir ficheiro(s)..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr "Adicionar ficheiro(s) à lista de reprodução..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr "Adicionar pasta(s) à lista de reprodução..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr "Ligações simbólicas"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "Eliminar ficheiros do disco"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -2204,19 +2252,19 @@ msgstr ""
 "Os ficheiros serão eliminados. Continuar?\n"
 "(Pode desativar esta opção nas definições do extra GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "Carregar lista de reprodução"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "Outros ficheiros (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr "Gravar lista de reprodução como"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Ficheiros DeaDBeeF (*.dbpl)"
 
@@ -2250,102 +2298,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr "Nada selecionado."
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "O widget %s não está disponível"
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr "Substituir por..."
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr "Inserir..."
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr "Cortar"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr "Colar"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr "Não é possível ter vários widgets deste tipo"
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr "Bloquear movimentação"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr "Mover separador à esquerda"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr "Mover separador à direita"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr "Remover separador"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr "Mudar nome do separador"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr "Adicionar separador"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr "Mostrar título das colunas"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr "Expandir caixa em 1 item"
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr "Encolher caixa em 1 item"
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr "Homogéneo"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr "Expandir"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr "Preencher"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr "Configurar botão"
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr "Vozes:"
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr "Editar lista de reprodução"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr "Mudar nome da lista de reprodução"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr "Remover lista de reprodução"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr "Adicionar lista de reprodução"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr "Nome"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr "Explorador de listas de reprodução"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a6ff2a5..3d074b6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "deadbeef-player/language/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -21,17 +21,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Sobre o DeaDBeef %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Registro de alterações - DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Tradutores do DeaDBeeF"
@@ -88,44 +88,44 @@ msgstr "Pré-amplificação zero"
 msgid "Zero Bands"
 msgstr "Bandas a zero"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Predefinições"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dia %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dias %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Parado | %d faixas | %s tempo total de reprodução"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Pausado | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -133,748 +133,775 @@ msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d faixas | %s tempo total de "
 "reprodução"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Nova lista"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nova lista (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Falha ao ler o arquivo de ajuda"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Falha ao carregar o arquivo de ajuda"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Alerta"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Abrir arquivos(s)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Adicionar arquivo(s)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Adicionar pasta(s)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Adicionar local"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Nova lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Carregar lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Salvar lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Selecionar tudo"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Desmarcar tudo"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Inverter seleção"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Seleção"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Remover"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Cortar"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Procurar"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Título"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Número da faixa"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Álbum"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Artista"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Data"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Aleatória"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Personalizar"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Ver"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Barra de status"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Equalizador"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Reprodução"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Ordem"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Linear"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Embaralhar faixas"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Embaralhar álbuns"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Repetição"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Rolagem segue a reprodução"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Cursor segue a reprodução"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Parar após a atual"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Ir para a faixa atual"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "Registro de _alterações"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Tradutores"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Pesquisar"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Parar"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Reproduzir"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Anterior "
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Próxima"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Reprodução aleatória"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Sobre"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Sair"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Propriedades da faixa"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Configuração"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Fechar"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadados"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Propriedades"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Título:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Digite o novo título da coluna aqui"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Índice de itens"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Em reprodução"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Capa do álbum"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Artista - Álbum"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Duração"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Número da faixa"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Banda / Artista do álbum"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Alinhamento:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Direita"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Plugin de saída:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Dispositivo de saída:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Sempre converter áudio de 8 bits para 16 bits"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Som"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Modo de normalização:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Desabilitado"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Faixa"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Ajustar a normalização com o nível de pico"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Pré-amplificação da normalização:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Pré-amplificação global:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Adicionar arquivos pela linha de comando (ou gerenciador de arquivos) a esta "
 "lista de reprodução:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Continuar a sessão anterior ao iniciar"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Não adicionar de arquivos ao adicionar pastas"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Reprodução"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Configurar"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Predefinição de corrente do DSP"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Carregar"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Fechar minimiza para a área de notificação"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Ocultar o ícone na área de notificação"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Taxa de atualização da interface (vezes por segundo):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Texto na barra de título durante a reprodução:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Texto na barra de título quando parado:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Plugin da interface gráfica (mudança requer reinício):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Ocultar item \"Excluir do disco\" do menu de contexto"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Autonomear listas de reprodução ao adicionar uma única pasta"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Sobrepujar"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Primeiro plano"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Segundo plano"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Cores das barras volume/pesquisa"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Meio"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Claro"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Escuro"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Texto"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Cores do separador"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Sobrepujar (perde o tema GTK na visão em árvore, mas acelera a renderização)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Linha par"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Linha ímpar"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Linha selecionada"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Texto selecionado"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Cursor"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Cores da lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Cores"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Habilitar servidor proxy"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Endereço do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Porta do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Tipo de proxy:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Nome de usuário do proxy:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Senha do proxy:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Rede"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -882,122 +909,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Versão: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Direitos autorais"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Formato"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Descendente"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Selecionar plugin do DSP"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Configuração do editor de etiquetas"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Escrever ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Escrever ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Escrever APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Remover ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Remover ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Remover APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Versão ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Recomendado)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Codificação de caracteres ID3v1 (padrão é iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Escrever ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1005,91 +1038,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Artista / Álbum"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Nº da faixa"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Colocar na fila da lista de reprodução"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Remover da fila da lista de reprodução"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Recarregar metadados"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Remover do disco"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Adicionar coluna"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Editar coluna"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Remover coluna"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Agrupar por"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Nenhum"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Artista/Data/Álbum"
 
@@ -1106,11 +1148,11 @@ msgstr "Configurar %s"
 msgid "Default Audio Device"
 msgstr "Dispositivo de áudio padrão"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1118,7 +1160,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Adicionando arquivos..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Inicializando..."
 
@@ -1131,142 +1173,142 @@ msgid "Really close the window?"
 msgstr "Deseja realmente fechar esta janela?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Valores múltiplos]"
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Chave"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Valor"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Escrevendo etiquetas..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Os nomes dos campos não devem começar com : ou _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Incapaz de adicionar campo"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Um campo com esse nome já existe. Por favor, tente outro nome."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Adicionar campo"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Remover campo"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Opções:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  ou  -h     Imprime a ajuda (esta mensagem) e sai\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Fecha o DeaDBeeF\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Imprime informações da versão e sai\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Inicia a reprodução\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Para a reprodução\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Pausa a reprodução\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Pausa/reinicia\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 "   --play-pause       Inicia a reprodução se parado, senão pausa/reinicia\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Próxima música na lista de reprodução\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Música anterior na lista de reprodução\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Música aleatória na lista de reprodução\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr ""
 "   --queue            Acrescenta arquivos(s) à lista de reprodução "
 "existente\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Imprime o nome da faixa para a saída padrão\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1277,7 +1319,7 @@ msgstr ""
 "                      [l]duração, [n]úmero da faixa, [y]ano, [c]omentário,\n"
 "                      di[r]eitos autorais, tempo d[e]corrido\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1286,29 +1328,24 @@ msgstr ""
 "                      ex.: --nowplaying \"%%a - %%t\" deve imprimir\n"
 "                      \"artista - título\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      para mais informações, veja:\n"
-"http://sourceforge.net/apps/mediawiki/deadbeef/index.php?"
-"title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Padrão"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Sim"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Não"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1334,7 +1371,7 @@ msgstr ""
 "Banda / Artista do álbum\n"
 "Personalizar"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1342,7 +1379,7 @@ msgstr ""
 "Esquerda\n"
 "Direita"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1352,7 +1389,7 @@ msgstr ""
 "Faixa\n"
 "Álbum"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1360,7 +1397,7 @@ msgstr ""
 "Ascendente\n"
 "Descendente"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1368,14 +1405,7 @@ msgstr ""
 "2.3 (Recomendado)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Não foi possível encontrar o arquivo pixmap: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1388,7 +1418,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1681,7 +1711,7 @@ msgstr "Taxa de amostragem automática (sobrepuja a taxa de amostragem alvo)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1698,35 +1728,40 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "O arquivo já existe. Sobrescrever?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Alerta do conversor"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Selecione o codificador, por favor"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Erro do conversor"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Convertendo..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Selecionar pasta..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Falha ao salvar predefinição do codificador"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1734,78 +1769,78 @@ msgstr ""
 "Verifique as permissões da pasta de predefinições, tente com um título "
 "diferente ou libere algum espaço no disco"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 "Uma predefinição com o mesmo nome já existe. Tente um título diferente."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Erro"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Adicionar novo codificador"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Editar codificador"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Remover predefinição"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Esta ação irá excluir a predefinição selecionada. Tem certeza?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Codificadores"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Adicionar plugin à corrente do DSP"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Falha ao salvar predefinição do DSP"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Nova predefinição do DSP"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Editar predefinição do DSP"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "Predefinições do DSP"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Pasta de saída:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Nome do arquivo de saída:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1815,89 +1850,89 @@ msgstr ""
 "A extensão (ex. .mp3) será adicionada automaticamente.\n"
 "Deixe o campo vazio para o padrão (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Codificador:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "Predefinição do DSP:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Número de linhas de execução"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Formato da amostra de saída:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Manter o formato original"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "Inteiro de 8 bits com sinal"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "Inteiro de 16 bits com sinal"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "Inteiro de 24 bits com sinal"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "Inteiro de 32 bits com sinal"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 bits flutuante"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Quando o arquivo existir:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Perguntar"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Editar predefinição do codificador"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Codificador sem título"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Extensão do arquivo de saída:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Ex. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Linha de comando:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1908,7 +1943,7 @@ msgstr ""
 "%i para arquivo de entrada, %o para arquivo de saída, - para entrada padrão "
 "(stdin)"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1918,66 +1953,72 @@ msgstr ""
 "<small>%o - nome do arquivo de saída\n"
 "%i - nome do arquivo de entrada temporário</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Método:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Pipe"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Arquivo temporário"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Editor de etiquetas</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "Editor de predefinições do DSP"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Predefinição do DSP sem título"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Adicionar"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Não foi possível encontrar o arquivo pixmap: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2015,27 +2056,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2044,74 +2085,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2119,90 +2160,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2229,102 +2270,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index aea8c72..b84c40d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -4,16 +4,17 @@
 #
 # Translators:
 # Arthur Țițeică <arthur at psw.ro>, 2013
-# roentgen <arthur.titeica at gmail.com>, 2013
+# Arthur Țițeică <arthur.titeica at gmail.com>, 2013
+# Mișu Moldovan <dumol at l10n.ro>, 2014
 # Mișu Moldovan <dumol at xfce.org>, 2012
-# roentgen <arthur.titeica at gmail.com>, 2013
+# Arthur Țițeică <arthur.titeica at gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-08-02 12:24+0000\n"
+"Last-Translator: Mișu Moldovan <dumol at l10n.ro>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/ro/)\n"
 "Language: ro\n"
@@ -23,17 +24,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Despre DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Istoricul modificărilor DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Traducători DeaDBeeF"
@@ -48,7 +49,7 @@ msgstr "Fișiere cu presetări DeaDBeeF EQ (*.ddbeq)"
 
 #: ../plugins/gtkui/eq.c:187
 msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Încarcă presetări DeaDBeeF EQ..."
+msgstr "Încărcare presetări DeaDBeeF EQ..."
 
 #: ../plugins/gtkui/eq.c:191
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
@@ -68,11 +69,11 @@ msgstr "Salvare presetări"
 
 #: ../plugins/gtkui/eq.c:329
 msgid "Load Preset"
-msgstr "Încarcă presetări"
+msgstr "Încărcare presetări"
 
 #: ../plugins/gtkui/eq.c:337
 msgid "Import Foobar2000 Preset"
-msgstr "Import de presetări Foobar2000"
+msgstr "Import de  presetări Foobar2000..."
 
 #: ../plugins/gtkui/eq.c:362
 msgid "Enable"
@@ -90,795 +91,820 @@ msgstr "Zero preamp"
 msgid "Zero Bands"
 msgstr "Zero benzi"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Presetări"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "o zi %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d zile %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Oprit | %d piese | %s durată totală"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Pauză | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d piese | %s durată totală"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Listă de redare nouă"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Listă de redare nouă (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Listă de redare cu file"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Listă de redare"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "Separator (sus și jos)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "Separator (stânga și dreapta)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "File de liste de redare"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Proprietățile selecției"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Afișare copertă de album"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "Scop"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "Spectru"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Buton"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr "Bară de căutare"
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr "Controale de redare"
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr "Bară de volum"
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr "Voci sintetizate"
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Nu s-a putut citi fișierul ce conține ajutorul"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Nu s-a putut încărca fișierul ce conține ajutorul"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
-"În acest moment lectorul rulează sarcini în fundal. Dacă renunți acum, "
-"sarcinile vor fi anulate sau întrerupte. Acest lucru poate cauza pierderi de "
-"date."
+"Playerul are în lucru unele sarcini în fundal. Dacă îl închideți acum, "
+"aceste sarcini vor fi întrerupte sau se vor pierde. E posibil să pierdeți "
+"anumite date."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "Dorești în continuare să renunți?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Avertizare"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Fișier"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
-msgstr "_Deschide fișier(e)"
+msgstr "_Deschidere fișiere"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
-msgstr "Adaugă fișier(e)"
+msgstr "Adăugare fișiere"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
-msgstr "Adaugă dosar(e)"
+msgstr "Adăugare directoare"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
-msgstr "Adaugă locație"
+msgstr "Adăugare link"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Listă de redare nouă"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
-msgstr "Încarcă listă de redare"
+msgstr "Încărcare listă de redare"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
-msgstr "Salvează lista de redare"
+msgstr "Salvare listă de redare"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Ieșire"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Editare"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Golire"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
-msgstr "Selectează tot"
+msgstr "Selectare completă"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
-msgstr "Deselectează tot"
+msgstr "Deselectare completă"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
-msgstr "Inversează selecția"
+msgstr "Inversare a selecției"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Selecție"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
-msgstr "Șterge"
+msgstr "Ștergere"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
-msgstr "Decupează"
+msgstr "Decupare"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
-msgstr "_Caută"
+msgstr "_Căutare"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
-msgstr "Sortează după"
+msgstr "Sortare după"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Titlu"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Numărul piesei"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Artist"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Dată"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Aleatoare"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
-msgstr "Personalizat"
+msgstr "Personalizare..."
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Preferințe"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Vizualizare"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Bară de stare"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Egalizator"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "Mod design"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Redare"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Ordine"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Liniară"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Piese amestecate"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Albume amestecate"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Repetare"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Repetare pentru listă"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Repetare pentru piesa curentă"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "Fără repetare"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Lista se derulează la redare"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Selecția urmează redarea"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
 msgstr "Oprire după piesa curentă"
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr "Oprire după albumul curent"
+
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Salt la piesa curentă"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Ajutor"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Istoric"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Despre"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Traducători"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
-msgstr "Caută"
+msgstr "Căutare"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Stop"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Redare"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pauză"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Înapoi"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Înainte"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Aleator"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Despre"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Ieșire"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Ajutor"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Proprietățile piesei"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "Locație:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Opțiuni"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Aplică"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "În_chide"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadate"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Proprietăți"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Titlu:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
-msgstr "Introdu aici un nou titlu pentru coloană"
+msgstr "Introduceți aici un nou titlu pentru coloană"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Tip:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
-msgstr "Index elementului"
+msgstr "Index de elemente"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "În redare"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Copertă album"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Artist - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Durată"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Numărul piesei"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
-msgstr "Formație / Artist album"
+msgstr "Formație / Album Artist"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Aliniere:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Stânga"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Dreapta"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Renunță"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
-msgstr "Extensie pentru ieșire:"
+msgstr "Modul de ieșire audio:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Dispozitiv de ieșire audio:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Transformă întotdeauna audio pe 8 biți în 16 biți"
+msgstr "Convertire la 16-biți pentru piesele audio de 8-biți"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Transformă întotdeauna audio pe 16 biți în 24 de biți"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Sunet"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
-msgstr "Mod replaygain:"
+msgstr "Mod ReplayGain:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
-msgstr "Dezactivează"
+msgstr "Dezactivat"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Piesă"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
-msgstr "Scalare replaygain pentru vârfuri"
+msgstr "Scalare pentru vârfurile ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
-msgstr "Preamplificare replaygain:"
+msgstr "Preamplificare ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Preamplificare globală:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr ""
-"Folosește această listă pentru fișierele adăugate din linia de comandă (sau "
-"manager de fișiere):"
+msgstr "Fișierele adăugate extern intră în lista de redare:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
-msgstr "La pornire se încarcă sesiunea precedentă"
+msgstr "La pornire se reîncarcă sesiunea precedentă"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
-msgstr "La adăugarea de dosare nu se adaugă fișiere din arhive"
+msgstr "La adăugarea de directoare nu se adaugă fișiere  din arhive"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "Resetare automată pentru \"Oprire după piesa curentă\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr "Opțiunea de oprire după piesa curentă nu persistă"
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr "Opțiunea de oprire după albumul curent nu persistă"
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Redare"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Configurare"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Presetări lanț DSP:"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "Înca_rcă"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
-msgstr "DSP"
+msgstr "Procesare"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
-msgstr "Închiderea minimizează în zona de notificare"
+msgstr "Minimizare în zona de notificare la închiderea ferestrei"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
-msgstr "Ascunde pictograma din zona de notificare"
+msgstr "Fără iconiță în zona de notificare"
+
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "Detecție automată pentru codarea japoneză SHIFT-JIS"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "Activează detecția și recodarea pentru CP1251 (Rusia)"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Activează detecția si recodarea pentru CP936 (China)"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Frecvență de reîmprospătare a interfeței (per secundă):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Text în bara de titlu la redare:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Text în bara de titlu în pauză:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
-msgstr "Extensie pentru GUI (modificările necesită repornire):"
+msgstr "Modul GUI (modificările necesită repornire):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr "Lector"
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr "Închide listele de redare cu butonul de clic mijloc"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr "Desenează piesa care rulează folosind un font îngroșat"
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Ascunde \"Ștergere de pe disc\" în meniul contextual"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr "Fără „Ștergere de pe disc” în meniul contextual"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
-msgstr "Denumire automată pentru liste la adăugarea unui singur dosar"
+msgstr "Denumire automată pentru liste la adăugarea unui singur director"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr "Dimensionare automată a coloanelor pentru a se încadra în fereastră"
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "GUI/Altele"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Suprascriere"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Prim-plan"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Fundal"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Culorile barelor de redare și volum"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Între"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Deschis"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Închis"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Bază"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Text"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
-msgstr "Culorile filelor"
+msgstr "Culorile taburilor"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
-"Suprascriere (se pierde tema \"treeview\" GTK, dar se accelerează randarea)"
+"Suprascriere (se pierde tema „treeview” GTK, dar se accelerează randarea)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Rând par"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Rând impar"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Rând selectat"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Text selectat"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
-msgstr "Cursor"
+msgstr "Selecție"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Culorile listei de redare"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Culori"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
-msgstr "Folosește server proxy"
+msgstr "Activare server proxy"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Adresă server proxy:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Port server proxy:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Tip proxy:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Utilizator proxy:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Parolă proxy:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr "Editează mapările Content-Type"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Rețea"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr "Acceleratori folosiți:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr "Acțiune:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr "<Nesetat>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr "Combinație de taste:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "Accelerator global"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -890,122 +916,128 @@ msgstr ""
 "Modificările NU vor fi salvate\n"
 "dacă nu vei apăsa Aplică."
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr "_Implicit"
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "Acceleratori"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Versiune:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
-msgstr "Copyright"
+msgstr "Drepturi de autor"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
-msgstr "Extensii"
+msgstr "Module"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr "Titlu personalizat"
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "Grupează după ..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "Sortează după ..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Format"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Crescătoare"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Descrescătoare"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
-msgstr "Selectare extensie DSP"
+msgstr "Selectare modul DSP"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
-msgstr "Extensie"
+msgstr "Modul"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Opțiuni pentru scrierea etichetelor"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Scrie ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Scrie ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Scrie APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Șterge ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Șterge ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Șterge APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Versiune ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (recomandată)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "Cod de caractere pentru ID3v1 (implicit iso8859-1)"
+msgstr "Codare ID3v1 (implicit iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Scrie ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr "Mapăre Content-Type"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1017,91 +1049,106 @@ msgstr ""
 "pot avea tipul de conținut \"audio/x-mpeg\", și trebuie decodate de către "
 "extensia \"stdmpg\" proprie DeaDBeeF, sau de către extensia \"ffmpeg\"."
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr "Resetare la setări implicite"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr "Tip de conținut:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "Extensii:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr "Proprietățile butonului"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr "Culoare:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr "Culoare text:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr "Pictogramă:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr "Etichetă:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr "Alege acțiune"
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+"Acest dialog vă permite să alegeți un nume personalizat pentru orice pistă, "
+"ceea ce poate fi folositor la redarea stațiilor radio. O opțiune pentru a "
+"alege un titlu personalizat este prezentă și în dialogul „Adăugați un link”. "
+"Titlul va fi vizibil în coloanele ce afișează câmpul „Artist” în formatul "
+"„[personalizat] artist” dacă este prezent câmpul „Artist” sau doar "
+"„personalizat”, dacă nu e prezent."
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Artist / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Nr. piesă"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Adaugă în coada de redare"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr "Adăugare în coada de redare"
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Șterge din coada de redare"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr "Ștergere din coada de redare"
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Reîncarcă metadate"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr "Reîncarcare metadate"
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Șterge de pe disc"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr "Ștergere de pe disc"
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
-msgstr "Adaugă coloană"
+msgstr "Adăugare coloană"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
-msgstr "Editează coloană"
+msgstr "Editare coloană"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
-msgstr "Șterge coloană"
+msgstr "Ștergere coloană"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
-msgstr ""
+msgstr "Fixează grupurile la defilare"
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Grupează după"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Fără"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Artist/Dată/Album"
 
@@ -1118,20 +1165,20 @@ msgstr "Configurare %s"
 msgid "Default Audio Device"
 msgstr "Dispozitiv audio implicit"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 "Ai modificat setările pentru taste rapide dar nu ai salvat schimbările."
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr "Ești sigur că vrei să continui fără să salvezi?"
 
 #: ../plugins/gtkui/progress.c:56
 msgid "Adding files..."
-msgstr "Adaugă fișiere..."
+msgstr "Adăugare fișiere..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Inițializare..."
 
@@ -1141,105 +1188,105 @@ msgstr "Ați modificat datele acestei piese."
 
 #: ../plugins/gtkui/trkproperties.c:170
 msgid "Really close the window?"
-msgstr "Sigur dorești să închizi fereastra?"
+msgstr "Sigur doriți să închideți fereastra?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
-msgstr "[Valori multiple] "
+msgstr "[Valori multiple]"
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Cheie"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Valoare"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[Valori multiple]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Se scriu etichetele..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "Nume câmp"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Nume:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Numele câmpurilor nu pot începe cu : sau _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
-msgstr "Nu se poate adăuga câmpul"
+msgstr "Nu s-a putut adăuga câmpul"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
-msgstr "Un câmp cu acest nume deja există, te rog încearcă un alt nume."
+msgstr "Un câmp cu acest nume există deja, încercați să-l redenumiți."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
-msgstr "Adaugă câmp"
+msgstr "Adăugare câmp"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
-msgstr "Șterge câmp"
+msgstr "Ștergere câmp"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "Utilizare: deadbeef [opțiuni] [--] [fișier(e)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Opțiuni:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  sau -h     Arată acest mesaj de ajutor și ieși\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
-msgstr "   --quit             Ieșire din lector\n"
+msgstr "   --quit             Ieșire din player\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
-msgstr "   --version          Afișează detaliile versiunii și ieși\n"
+msgstr "   --version          Arată detaliile versiunii și ieși\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Pornește redarea\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Oprește redarea\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Pune pauză redării\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Comută starea de pauză\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1247,84 +1294,80 @@ msgstr ""
 "   --play-pause       Pornește redarea dacă e cazul sau comută starea de "
 "pauză\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Piesa următoare în lista de redare\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Piesa precedentă în lista de redare\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Piesă aleatoare din lista de redare\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Adaugă fișiere la lista de redare curentă\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
-"   --gui EXTENSIE     Precizează ce extensie GUI să fie utilizată, implicit "
+"   --gui MODUL        Precizează ce modul GUI să fie utilizat, implicit "
 "\"GTK2\"\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 "   --nowplaying FMT   Arată în ieșirea standard numele formatat al piesei\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
 "                      [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 "                      copy[r]ight, [e]lapsed\n"
 msgstr ""
-"                      Sintaxă FMT prefixată cu %%: [a]rtist, [t]itlu, al[b]"
-"um,\n"
-"                      [l]ungime, [n]umăr piesă, [y] pentru an, [c]"
-"omentariu,\n"
+"                      Sintaxă FMT prefixată cu %%: [a]rtist, [t]itlu, "
+"al[b]um,\n"
+"                      [l]ungime, [n]umăr piesă, [y] pentru an, "
+"[c]omentariu,\n"
 "                      d[r]epturi de autor, durată r[e]dată\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr ""
 "                      de ex.: --nowplaying \"%%a - %%t\" va rezulta în "
-"\"artist  - titlu\"\n"
+"\"artist - titlu\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
-msgstr ""
-"                      pentru mai multe detalii vezi http://sourceforge.net/"
-"apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
+msgstr "                      pentru mai multe detalii, consultați %s\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Implicit"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Da"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Nu"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1350,7 +1393,7 @@ msgstr ""
 "Formație / Artist Album\n"
 "Personalizat"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1358,25 +1401,25 @@ msgstr ""
 "Stânga\n"
 "Dreapta"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
 "Album"
 msgstr ""
-"Dezactivat\n"
+"Dezactivare\n"
 "Piesă\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
 msgstr ""
-"Crescător\n"
-"Descrescător"
+"Ascendent\n"
+"Descendent"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1384,32 +1427,25 @@ msgstr ""
 "2.3 (Recomandat)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Nu s-a putut găsi fișierul pixmap: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
 "package, or specify path to freepats.cfg in the plugin settings."
 msgstr ""
-"wildmidi: nu s-a găsit fișierul de configurare freepats. Instalează pachetul "
-"timidity-freepats sau introdu calea către freepats.cfg în opțiunile "
-"extensiei."
+"wildmidi: nu s-a găsit fișierul de configurare freepats. Instalați pachetul "
+"timidity-freepats sau specificați calea către freepats.cfg în opțiunile "
+"modulului."
 
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "Adaugă CD audio"
+msgid "Add Audio CD"
+msgstr "Adăugați un CD audio"
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
-msgstr "Caută pe Last.fm"
+msgstr "Căutare pe Last.fm"
 
 #. ALSA output plugin
 #: ../translation/extra.c:6
@@ -1435,7 +1471,7 @@ msgstr "Activare Scrobbler"
 
 #: ../translation/extra.c:12
 msgid "Disable nowplaying"
-msgstr "Dezactivare nowplaying"
+msgstr "Dezactivare „nowplaying”"
 
 #: ../translation/extra.c:13
 msgid "Username"
@@ -1451,21 +1487,21 @@ msgstr "URL Scrobble"
 
 #: ../translation/extra.c:16
 msgid "Prefer Album Artist over Artist field"
-msgstr "Preferă câmpul Artist album în locul cămpului Artist"
+msgstr "Preferă câmpul Artist al albumului"
 
 #. OSS output plugin
 #: ../translation/extra.c:18
 msgid "Device file"
-msgstr "Fișier dispozitiv"
+msgstr "Fișierul dispozitivului"
 
 #: ../translation/extra.c:19
 msgid "OSS4 samplerate bug workaround"
-msgstr "Soluție alternativă pentru hiba ratei de eșantionare OSS4"
+msgstr "Soluție alternativă pentru problema ratei de eșantionare OSS4"
 
 #. Album Artwork plugin
 #: ../translation/extra.c:21
 msgid "Cache update period (hr)"
-msgstr "Perioada de actualizare pentru cache (ore)"
+msgstr "Perioadă de actualizare pentru cache (ore)"
 
 #: ../translation/extra.c:22
 msgid "Fetch from embedded tags"
@@ -1473,19 +1509,19 @@ msgstr "Extrage din etichetele încorporate"
 
 #: ../translation/extra.c:23
 msgid "Fetch from local folder"
-msgstr "Extrage din dosarul local"
+msgstr "Extrage din directorul local"
 
 #: ../translation/extra.c:24
 msgid "Local cover file mask"
-msgstr "Mască pentru fișierele locale cu coperte"
+msgstr "Mască pentru fișierele local cu coperte"
 
 #: ../translation/extra.c:25
 msgid "Fetch from last.fm"
-msgstr "Extrage din Last.fm"
+msgstr "Extrage de la Last.fm"
 
 #: ../translation/extra.c:26
 msgid "Fetch from albumart.org"
-msgstr "Extrage din albumart.org"
+msgstr "Extrage de la albumart.org"
 
 #: ../translation/extra.c:27
 msgid "Scale artwork towards longer side"
@@ -1502,11 +1538,11 @@ msgstr "Preferă CD-Text înaintea CDDB"
 
 #: ../translation/extra.c:31
 msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "Server CDDB (de ex. 'freedb.org')"
+msgstr "Server CDDB (de ex. „freedb.org”)"
 
 #: ../translation/extra.c:32
 msgid "CDDB port number (e.g. '888')"
-msgstr "Port CDDB (de ex. '888')"
+msgstr "Port CDDB (de ex. „888”)"
 
 #: ../translation/extra.c:33
 msgid "Prefer CDDB protocol over HTTP"
@@ -1519,11 +1555,11 @@ msgstr "Activează suportul pentru imagini NRG"
 #. DUMB module player plugin
 #: ../translation/extra.c:36
 msgid "Resampling quality (0..2, higher is better)"
-msgstr "Calitatea reeșantionării (0..2, mai mare e mai bine)"
+msgstr "Calitatea reeșantionării (0-2, 2 e calitate maximă)"
 
 #: ../translation/extra.c:37
 msgid "8-bit output (default is 16)"
-msgstr "Ieșire pe 8-biți (implicit este 16)"
+msgstr "Output 8-bit (implicit e 16)"
 
 #. Game_Music_Emu decoder plugin
 #: ../translation/extra.c:39
@@ -1557,8 +1593,7 @@ msgstr "Execută gtk_init cu --sync (mod de depanare)"
 
 #: ../translation/extra.c:47
 msgid "Add separators between plugin context menu items"
-msgstr ""
-"Adaugă separatori între elementele din meniul contextual al extensiilor"
+msgstr "Adaugă separatori între elementele modulelor din meniul contextual"
 
 #. OSD Notify plugin
 #: ../translation/extra.c:49
@@ -1676,7 +1711,7 @@ msgstr "Codec"
 #. FFmpeg deocder plugin
 #: ../translation/extra.c:89
 msgid "File Extensions (separate with ';')"
-msgstr "Extensii de fișiere (separate prin ';')"
+msgstr "Extensii de fișiere (separate prin ;)"
 
 #. Converter GUI
 #: ../translation/extra.c:91
@@ -1698,8 +1733,8 @@ msgstr "Rată de eșantionare automată (suprascrie rata țintă)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
-msgstr "Configurare comenzi shell personalizate"
+msgid "Configure Custom Shell Commands"
+msgstr "Comenzi shell personalizate…"
 
 #. mpgmad
 #: ../translation/extra.c:99
@@ -1715,113 +1750,118 @@ msgstr "Preferă Ken emu înaintea Satoh (fără surround)"
 msgid "Enable surround"
 msgstr "Activare surround"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr "[Inclus] %s"
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
-msgstr "Fișierul există deja. Îl suprascrii?"
+msgstr "Fișierul există deja. Doriți să îl suprascrieți?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Avertizare de la convertor"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Selectați un codor"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Eroare de convertire"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
-msgstr "Conversie..."
+msgstr "În convertire..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
-msgstr "Selectează dosar..."
+msgstr "Selectați un director..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Nu s-au putut salva presetările codorului"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
-"Verificați drepturile pentru dosarul cu presetări, alegeți un alt titlu sau "
-"eliberați mai mult spațiu pe disc"
+"Verificați drepturile pentru directorul cu presetări, alegeți un alt titlu "
+"sau eliberați mai mult spațiu pe disc"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "Există deja o presetare cu acest nume. Alegeți un alt titlu."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Eroare"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
-msgstr "Adaugă codor nou"
+msgstr "Adăugare codor nou"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Editare codor"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Ștergere codor"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Această acțiune va șterge predefiniția selectată. Ești sigur?"
+msgstr "Această acțiune va șterge predefiniția selectată. Sigur doriți asta?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Codoare"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
-msgstr "Adăugare extensie în lanțul DSP"
+msgstr "Adaugare modul în lanțul DSP"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Nu s-a putut salva predefiniția DSP"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Nouă presetare DSP"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Editare presetare DSP"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "Presetări DSP"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
-msgstr "Dosar cu rezultate:"
+msgstr "Director cu rezultate:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
-msgstr "Scrie în dosarul pieselor originale"
+msgstr "Scrie în directorul pieselor originale"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
-msgstr "Păstrează structura de dosare"
+msgstr "Păstrează structura de directoare"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Nume fișier rezultat:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1829,91 +1869,91 @@ msgid ""
 "Leave the field empty for default (%a - %t)."
 msgstr ""
 "Extensia (de ex. .mp3) va fi adăugată automat.\n"
-"Lasă câmpul gol pentru valoarea implicită (%a - %t)."
+"Lăsați câmpul gol pentru valoarea implicită (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Codor:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "Presetare DSP:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Număr de fire de execuție:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Eșantionarea finală:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Păstrează formatul sursei"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 bit signed int"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 bit signed int"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 bit signed int"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 bit signed int"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 bit float"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Dacă fișierul există:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Întreabă"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Suprascrie"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Editare presetare codor"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Codor fără nume"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Extensie fișier rezultat:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "De ex. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Linie de comandă:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1923,7 +1963,7 @@ msgstr ""
 "Exemplu: lame - %o\n"
 "%i pentru fișierul input, %o pentru fișierul rezultat, - pentru stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1933,65 +1973,71 @@ msgstr ""
 "<small>%o - nume fișier rezultat\n"
 "%i - nume fișier temporar de input</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Metodă:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
-msgstr "Pipe"
+msgstr "Conector „pipe”"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Fișier temporar"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Scriere de etichete</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "Editor de presetări DSP"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Presetare DSP fără nume"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
-msgstr "Adaugă"
+msgstr "Adăugare"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nu s-a putut găsi fișierul pixmap: %s"
 
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
@@ -2022,7 +2068,7 @@ msgid ""
 "Pipe\n"
 "Temporary file"
 msgstr ""
-"Pipe\n"
+"Pipă\n"
 "Fișier temporar"
 
 #: ../plugins/shellexecui/interface.c:46
@@ -2030,27 +2076,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr "Comenzi shell personalizate"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "Editare"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "Închide"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
-msgstr "Editează comanda"
+msgstr "Editare coloană"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "Comandă:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2062,149 +2108,152 @@ msgstr ""
 "fost pornit DeaDBeeF. Se poate utiliza formatarea titlului. De exemplu: xdg-"
 "open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
-msgstr "ID:"
+msgstr "Nume:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
-msgstr "Nume arbitrar, de exemplu \"Comanda mea shell\""
+msgstr "Nume arbitrar, de exemplu „Comanda mea shell”"
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
-"ID comendă, în mod obișnuit ar trebui să fie ceva scurt, de exemplu "
+"Numele comenzii, în mod obișnuit ar trebui să fie ceva scurt, de exemplu "
 "\"youtube_open\". Trebuie să fie unic."
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr "Piese unice"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "Funcționează doar pentru o piesă unică."
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "Piese multiple"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "Funcționează pentru piese multiple."
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "Local"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "Funcționează pentru fișiere locale."
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr "La distanță"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
-msgstr "Funcționează pentru linkuri la distanță (de ex. fluxuri http://)"
+msgstr "Funcționează pentru linkuri la distanță (de ex. fluxuri HTTP)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "Generic (în meniul principal)"
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "Elementul va apărea în meniul principal"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version.</small>"
 msgstr ""
+"<small>Dacă doriți să adăugați comanda în meniul principal, asigurați-vă că "
+"titlul conține calea din meniu, de exemplu „File/Comanda Mea”, unde «File» "
+"este numele în engleză al elementului din meniu.</small>"
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
-msgstr "Adaugă comandă"
+msgstr "Adăugare coloană"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
-msgstr "Șterge"
+msgstr "Ștergere"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr "Această acțiune va șterge comanda shell selectată. Ești sigur?"
+msgstr "Această acțiune va șterge comanda shell selectată. Sigur doriți asta?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
-msgstr "Confirmă ștergerea"
+msgstr "Confirmare eliminare"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
-msgstr "ID trebuie să fie completat și trebuie să fie unic.\n"
+msgstr "Numele nu poate fi gol și trebuie să fie unic.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
-msgstr "Titlul trebuie să fie completat.\n"
+msgstr "Titlu nu poate fi gol.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
-msgstr "Comanda shell trebuie să fie completată.\n"
+msgstr "Comanda shell nu poate fi goală.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "Valori nevalide"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr "Formate de sunet suportate"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "Toate fișierele (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr "Deschide fișier(e)..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr "Adaugă fișier(e) în listă..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr "Adaugă dosar(e) în listă..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr "Urmărește legăturile"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "Șterge fișierele de pe disc"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -2212,19 +2261,19 @@ msgstr ""
 "Fișierele se vor pierde. Continui?\n"
 "(Acest mesaj poate fi dezactivat în setările extensiei GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "Încarcă listă de redare"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "Alte fișiere (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr "Salvează lista de redare ca"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Fișiere de listă DeadBeeF (*.dbpl)"
 
@@ -2258,102 +2307,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr "Nu s-a selectat nimic."
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "Widgetul „%s” nu este disponibil"
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr "Înlocuiește cu..."
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr "Adaugă..."
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr "Taie"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr "Copiază"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr "Lipește"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
-msgstr ""
+msgstr "Nu există suport pentru mai multe widgeturi de acest tip"
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr "Blochează mișcarea"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr "Mută fila spre stânga"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr "Mută fila spre dreapta"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr "Înlătură fila"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr "Redenumește fila"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr "Adaugă o nouă filă"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr "Arată titlul coloanelor"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr "Extinde setul cu 1 element"
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr "Micșorează setul cu 1 element"
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr "Omogen"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr "Extinde"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr "Umple"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr "Configurează buton"
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr "Voci:"
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr "Editează lista de redare"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr "Redenumește lista de redare"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr "Înlătură lista de redare"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr "Adaugă o nouă listă de redare"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr "Nume"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr "Navigator liste de redare"
diff --git a/po/ru.po b/po/ru.po
index 388fb50..c08df36 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,16 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# waker <wakeroid at gmail.com>, 2013
+# Alexey Yakovenko <wakeroid at gmail.com>, 2013-2014
+# Andrei Stepanov, 2014
+# Andrei Stepanov, 2014
 # Dmitriy Simbiriatin <slpiv at mail.ru>, 2010
-# waker <wakeroid at gmail.com>, 2013
+# Alexey Yakovenko <wakeroid at gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:30+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/ru/)\n"
 "Language: ru\n"
@@ -22,17 +24,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "О программе DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Изменения в DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Переводчики DeaDBeeF "
@@ -89,804 +91,836 @@ msgstr "Обнулить предусиление"
 msgid "Zero Bands"
 msgstr "Обнулить частоты"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Предустановки"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 день %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d дней %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Стоп | %d дорожек | %s общее время"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Моно"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Стерео"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d кбит/с "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Пауза | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dГц | %d бит | %s | %d:%02d / %s | %d дорожек | %s общее время"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Новый плейлист"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Новый плейлист (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Плейлист с вкладками"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Плейлист"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "Разделитель (верх и низ)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "Разделитель (лево и право)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "Вкладки плейлистов"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Свойства выделенного"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Отображение обложки альбома"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "Scope"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "Спектральный анализатор"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Кнопка"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr "Полоса перемотки"
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr "Элементы управления проигрыванием"
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr "Регулятор громкости"
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr "Управление каналами chiptunes"
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Не удалось прочитать файл справки"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Не удалось загрузить файл справки"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
-"В данный момент, плеер выполняет фоновые задачи. Если вы завершите его "
-"сейчас, задачи будут отменены или прерваны. Это может привести к потере "
-"данных."
+"В данный момент, проигрыватель выполняет фоновые задачи. Если вы завершите "
+"его сейчас, задачи могут быть отменены или прерваны. Это может привести к "
+"потере данных."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "Вы все еще хотите выйти?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Файл"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Открыть файл(ы)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Добавить файл(ы)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Добавить каталог(и)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Добавить расположение"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Новый плейлист"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Загрузить плейлист"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Сохранить плейлист"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Выход"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Очистить"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Выделить всё"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Снять выделение"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Обратить выделение"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Выделенное"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Удалить"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Оставить выделенное"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Найти"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Сортировать по"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Название"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Номер дорожки"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Альбом"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Исполнитель"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Дата"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Случайно"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Пользовательский"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Вид"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Строка состояния"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Эквалайзер"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "Режим дизайна"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "Воспр_оизведение"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Порядок"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "По очереди"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Перемешивать дорожки"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Перемешивать альбомы"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Повторять"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Зациклить все"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Зациклить одиночную песню"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "Не зацикливать"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Прокручивать плейлист автоматически"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Выделять текущую дорожку"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Останавливать после текущей"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr "Останавливать после текущей дорожки"
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr "Остановить после текущего альбома"
+
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Перейти на текущую дорожку"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Справка"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Изменения"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_О программе"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Переводчики"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Поиск"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Стоп"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Воспроизвести"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Предыдущая"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Следующая"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Играть вразброс"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "О программе"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Выход"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Справка"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Свойства дорожки"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "Расположение:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Настройки"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Применить"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Закрыть"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Метаданные"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Свойства"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Название:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Введите название нового столбца"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Порядковый номер"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Воспроизводится"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Обложка альбома"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Исполнитель - Альбом"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Продолжительность"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Номер дорожки"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Группа / Исполнитель альбома"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Формат:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Выравнивание:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "По левому краю"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "По правому краю"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Отмена"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Модуль вывода:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Устройство вывода:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Всегда преобразовывать 8-битный звук в 16-битный"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Всегда преобразовывать 16-битный звук в 24-битный"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Звук"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Режим автовыравнивания громкости:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Отключён"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Дорожка"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Использовать пиковое значение"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 дБ"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 дБ"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Предусиление автовыравнивания громкости:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Общее предусиление громкости:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Добавлять файлы из командной строки\n"
 "(или файлового менеджера) в этот плейлист:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Восстанавливать предыдущую сессию при запуске"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Не добавлять из архивов при добавлении каталогов"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "Авто-сбрасывать \"Остановку после текущей песни\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+"Опция \"Останавливать после текущей дорожки\" будет отключаться после "
+"срабатывания"
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+"Опция \"Останавливать после текущего альбома\" будет отключаться после "
+"срабатывания"
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Воспроизведение"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Настроить"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Предустановка для цепочки DSP"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Загрузить"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Сворачивать в трей при закрытии"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Не показывать значок в трее"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+"Включить авто-определение и перекодирование японской кодировки SHIFT-JIS"
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "Включить определение и перекодирование русской CP1251"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Включить определение и перекодирование китайской CP936"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Частота обновления интерфейса (раз за секунду):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Текст заголовка при проигрывании:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Текст заголовка при остановке:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Графический интерфейс (для изменения необходим перезапуск):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr "Проигрыватель"
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr "Закрывать плейлисты средней кнопкой мыши"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr "Рисовать текущий трек жирным шрифтом"
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Убрать пункт \"Удалить с диска\" из контекстного меню"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr "Скрыть опцию контекстного меню \"Удалить с диска\""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Автоматически именовать плейлисты при добавлении одного каталога"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr "Автоматический размер колонок под размер окна"
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "Интерфейс/Разное"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Заменить"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Передний план"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Фон"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Основные цвета"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Средний"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Светлый"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Тёмный"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Базовый"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Текст"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Цвета вкладок"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Заменить (теряются настройки темы GTK , но увеличивается скорость "
 "визуализации)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr ""
 " Чётная \n"
 " строка"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr ""
 " Нечётная \n"
 "   строка"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr ""
 " Выделенная \n"
 "      строка"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr ""
 " Выделенный \n"
 "        текст"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Курсор"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Цвета плейлиста"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Цвета"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Включить прокси-сервер"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Адрес:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Порт:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Тип прокси:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Имя пользователя:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Пароль:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr "Редактирование ассоциаций Content-Type"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Сеть"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr "Назначенные горячие клавиши:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr "Действие:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr "<Пусто>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr "Сочетание клавиш:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "Глобальная горячая клавиша"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -898,122 +932,128 @@ msgstr ""
 "Изменения НЕ сохранятся до тех пор,\n"
 "пока вы не нажмете Применить."
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr "_Умолчания"
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "Горячие клавиши"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Версия:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Авторские права"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Расширения"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "Адрес:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr "Присвоить собственное название"
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
-msgstr "Группировать По ..."
+msgstr "Группировать по ..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "Сортировать по ..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Формат"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "По возрастанию"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "По убыванию"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Выберите расширение DSP"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Расширение"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Настройки редактора тегов"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Писать ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Писать ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Писать APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Вырезать ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Вырезать ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Вырезать APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Версия ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Рекомендуемая)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Кодировка ID3v1 (по умолчанию iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Писать ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr "Ассоциации Content-Type"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1025,91 +1065,106 @@ msgstr ""
 "\"audio/x-mpeg\", и должны раскодироваться одним из плагинов \"stdmpg\" либо "
 "\"ffmpeg\"."
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr "Сбросить в умолчание"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr "Content-Type:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "Плагины:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr "Свойства кнопки"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr "Цвет:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr "Цвет текста:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr "Иконка:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr "Надпись:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr "Выбор действия"
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+"Этот диалог позволяет установить собственное название для любого трека. Это "
+"наиболее полезно для радиостанций. Такая же опция присутствует в диалоге "
+"\"Добавить расположение\". Переопределенное название появится в колонках, "
+"отображающих поле \"Artist\" (Исполнитель), и будет выглядеть как "
+"\"[переопределенное название] исполнитель\", если присутствует поле Artist, "
+"либо просто \"переопределенное название\", если его нет."
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Исполнитель / Альбом"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "№"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Добавить в очередь"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr "Добавить в очередь воспроизведения"
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Удалить из очереди"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr "Удалить из очереди воспроизведения"
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
 msgstr "Обновить метаданные"
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Удалить с жёсткого диска"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr "Удалить с диска"
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
-msgstr "Добавить столбец"
+msgstr "Добавить колонку"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
-msgstr "Редактировать столбец"
+msgstr "Редактировать колонку"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
-msgstr "Удалить столбец"
+msgstr "Удалить колонку"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr "Прикреплять группы во время скроллинга"
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Группировать по"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Отсутствует"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Исполнитель/Дата/Альбом"
 
@@ -1126,11 +1181,11 @@ msgstr "Настроить %s"
 msgid "Default Audio Device"
 msgstr "Аудио устройство по умолчанию"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr "Вы изменили настройки горячих клавиш, но не сохранили изменения."
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr "Вы уверены, что хотите продолжить без сохранения?"
 
@@ -1138,7 +1193,7 @@ msgstr "Вы уверены, что хотите продолжить без с
 msgid "Adding files..."
 msgstr "Добавление файлов..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Загрузка..."
 
@@ -1151,105 +1206,105 @@ msgid "Really close the window?"
 msgstr "Закрыть окно?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Несколько значений] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Ключ"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Значение"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[Много значений]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Запись тегов..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "Название поля"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Название:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Имена полей не должны начинаться с \":\" или \"_\""
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Не удаётся добавить поле"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Поле с таким же именем уже сущестует, пожалуйста, выберите другое имя."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Добавить поле"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Удалить поле"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "Использование: deadbeef [options] [--] [file(s)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Опции:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr ""
 "   --help  или  -h     Вывести на экран справку (это сообщение) и выйти\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit              Выйти из плеера\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr ""
 "   --version           Вывести на экран информацию о версии программы и "
 "выйти\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play              Начать воспроизведение\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop              Остановить воспроизведение\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause             Приостановить воспроизведение\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause      Приостановить воспроизведение\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1257,40 +1312,40 @@ msgstr ""
 "   --play-pause        Начать воспроизведение если остановлено, в противном "
 "случае - приостановить\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next              Следующая дорожка в плейлисте\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev              Предыдущая дорожка в плейлисте\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random            Воспроизведение случайной дорожки в плейлисте\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue             Добавить файл(ы) в существующий плейлист\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 "   --gui PLUGIN       выбор плагина интерфейса, по-умолчанию \"GTK2\"\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 "   --nowplaying FMT    Вывести на экран форматированное название дорожки\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1303,7 +1358,7 @@ msgstr ""
 "комментарий,\n"
 "                       %%r-авторские права, %%e-время, которое прошло \n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1312,28 +1367,24 @@ msgstr ""
 "                       Например: --nowplaying \"%%a - %%t\" должна вывести "
 "на экран \"artist - title\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
-msgstr ""
-"                      для дополнительной информации, смотрите http://"
-"sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
+msgstr "                      для дополнительной информации, см. %s\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Плейлист"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Да"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Нет"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1359,7 +1410,7 @@ msgstr ""
 "Группа / Исполнитель альбома\n"
 "Разное"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1367,7 +1418,7 @@ msgstr ""
 "Левый\n"
 "правый"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1377,7 +1428,7 @@ msgstr ""
 "Дорожка\n"
 "Альбом"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1385,7 +1436,7 @@ msgstr ""
 "По возрастанию\n"
 "По убыванию"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1393,14 +1444,7 @@ msgstr ""
 "2.3 (Рекомендуемая)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Не удалось найти файл изображения : %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1413,7 +1457,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr "Добавить аудио CD"
 
 #: ../translation/extra.c:4
@@ -1707,8 +1751,8 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
-msgstr "Настройка собственных shell-команд"
+msgid "Configure Custom Shell Commands"
+msgstr "Настройка собственных шелл-команд"
 
 #. mpgmad
 #: ../translation/extra.c:99
@@ -1724,35 +1768,40 @@ msgstr "Предпочитать эмулятор Ken над Satoh (surround н
 msgid "Enable surround"
 msgstr "Включить surround"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr "[Встроенный] %s"
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Файл уже существует. Перезаписать?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Converter предупреждение"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Пожалуйста, выберите кодировщик"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Converter ошибка"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Конвертирование..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Выберите каталог..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Не удалось сохранить предустановку кодировщика"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1760,77 +1809,77 @@ msgstr ""
 "Проверьте права доступа на папку, в которой находится предустановка, "
 "выберите другое имя или освободите место на диске"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "Предустановка с таким же именем уже существует. Выберите другое имя."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Добавить кодировщик"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Редактировать кодировщик"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Удалить предустановку"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Это действие приведёт к удалению выбранной предустановки. Вы уверены? "
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Кодировщики"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Добавить расширение  в цепочку DSP"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Не удалось сохранить предустановку DSP"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Новая предустановка DSP"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Редактировать предустановку DSP "
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "Предустановки DSP"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Выходной каталог:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr "Писать в папку исходного трека"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr "Сохранить структуру каталогов"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Имя выходного файла:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1840,89 +1889,89 @@ msgstr ""
 "Расширение (например, .mp3) будет добавлено автоматически.\n"
 "Оставьте это поле пустым для использования настроек по умолчанию (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Кодировщик:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "Предустановка DSP:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Количество потоков:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Выходной формат сэмплов:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Оставить исходный формат"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 бит целочисленный"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 бит целочисленный"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 бит целочисленный"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 бит целочисленный"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 бит вещественный"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Если файл существует:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Спросить"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Заменить"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Редактировать предустановки"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Безымянный кодировщик"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Расширение выходного файла:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Например mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Командная строка"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1932,7 +1981,7 @@ msgstr ""
 "Пример: lame - %o\n"
 "\"%i\" для входного файла, \"%o\" для выходного файла, \"-\" для stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1942,66 +1991,72 @@ msgstr ""
 "<small>\"%o\" - имя выходного файла\n"
 "\"%i\" - имя временного входного файла</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Метод:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Конвейер"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Временный файл"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Запись тегов</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "Редактор предустановок DSP"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Безымянная предустановка DSP"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Добавить"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Не удалось найти файл изображения : %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2039,27 +2094,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr "Собственные shell-команды"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "Редактировать"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "Закрыть"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "Редактировать Команду"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "Команда:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2071,17 +2126,17 @@ msgstr ""
 "было запущено основное приложение. Может применяться title formatting. "
 "Пример: xdg-open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "ID:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr "Произвольное название, например \"Моя shell-команда\""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
@@ -2090,57 +2145,57 @@ msgstr ""
 "ID команды, обычно это короткий идентификатор, например \"youtube_open\". "
 "Должен быть уникален."
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr "Одиночные Треки"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "Работает с одним выделенным треком."
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "Много треков"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "Работает когда выделено много треков."
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "Локальный"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "Работает с локальными файлами."
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr "Удаленные"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr "Работает с сетевыми файлами (например потоки http://)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr "Общая (Главное меню)"
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "Команда появится в главном меню"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2151,72 +2206,72 @@ msgstr ""
 "название команды содержит путь меню, как здесь: \"File/Моя команда\", где "
 "File -- название меню из английской версии.</small>"
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Добавить команду"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "Это действие удалит выбранную shell-команду. Вы уверены?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr "Подтверждение удаление"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr "ID должен быть не пустым и уникальным\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr "Название должно быть непустым.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr "Shell-команда должна быть непустой.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "Недопустимые Значения"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr "Поддерживаемые звуковые форматы"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "Все файлы (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr "Открыть файл(ы)..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr "Добавить файл(ы) в плейлист..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr "Добавить папки в плейлист..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr "Следовать по symlink'ам"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr "help.ru.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "Удалить файлы с диска"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -2224,19 +2279,19 @@ msgstr ""
 "Файлы будут потеряны. Продолжить?\n"
 "(Этот диалог может быть отключен в настройках плагина GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "Загрузить плейлист"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "Другие файлы (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr "Сохранить плейлист как"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Файлы плейлистов DeaDBeeF (*.dbpl)"
 
@@ -2270,103 +2325,112 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr "Ничего не выбрано."
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "Виджет \"%s\" недоступен"
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr "Заменить на..."
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr "Вставить..."
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr "Вырезать"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr "Скопировать"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr "Вставить"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 "Одновременное отображение нескольких виджетов данного типа не поддерживается."
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr "Заблокировать перемещение"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr "Передвинуть вкладку влево"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr "Передвинуть вкладку вправо"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr "Удалить вкладку"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr "Переименовать вкладку"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr "Добавить новую вкладку"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr "Показывать заголовки колонок"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr "Расширить этот бокс на 1 элемент"
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr "Сузить этот бокс на 1 элемент"
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr "Равномерный"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr "Расширять"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr "Заполнять"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr "Настроить кнопку"
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr "Голоса:"
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr "Редактировать плейлист"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr "Переименовать плейлист"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr "Удалить плейлист"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr "Добавить новый плейлист"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr "Название"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr "Браузер плейлистов"
diff --git a/po/si_LK.po b/po/si_LK.po
index 6cc8540..c54a106 100644
--- a/po/si_LK.po
+++ b/po/si_LK.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# amscata <amith at compsoc.lk>, 2013
-# amscata <amith at compsoc.lk>, 2013
+# Amith Chinthaka <amith at compsoc.lk>, 2013
+# Amith Chinthaka <amith at compsoc.lk>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/"
 "deadbeef-player/language/si_LK/)\n"
 "Language: si_LK\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "DeaDBeeF පිළිබඳ විස්තර %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s වෙනස්කම් ලොගය"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF පරිවර්තකයින්"
@@ -87,790 +87,815 @@ msgstr "පූර්ව වර්ධකය ශුන්‍යය කරන්න
 msgid "Zero Bands"
 msgstr "කලාප ශුන්‍යය කරන්න"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "සැකසුම්"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "දිනක් %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "දින %d %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Stopped | %d tracks | %s මුළු ධාවන කාලය"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "එකම ශබ්දය දෙපසින්ම ඇසීම"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "ශබ්ද දෙකක් දෙපසින් ඇසීම"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps"
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "මදකට නවතා ඇත |"
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d ගීත| %s මුළු ධාවන කාලය"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "නව ගීත ලැයිස්තුව"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "නව ගීත ලැයිස්තුව (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "ටැබ සහිත ගීත ලැයිස්තුව"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "ගීත ලැයිස්තුව"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "විභේදකය (ඉහළ සහ පහළ)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "විභේදකය (වම සහ දකුණ)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "ගීත ලැයිස්තු ටැබ"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "වරණ සතු ගුණාංග"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "ඇල්බම රූප දර්ශනය"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "බලපවත්නා අවකාශය"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "වර්ණාවලිය"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "බොත්තම"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "උපකාරක ගොනුව කියවීමට අසමත් විය"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "උපකාරක ගොනුව විවෘත කිරීමට නොහැකි විය"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
-"ධාවකය පසුබිම් කාර්යයක් සිදුකරමින් සිටියි. මේ මොහොතේ එම ධාවකය වසා දැමුවහොත් හෝ එයට බාධා "
-"කළහොත් එමඟින් දත්ත හානියක් ඇති වීමට ඉඩකඩ ඇත."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "ඔබට තවමත් වසා දැමීමට අවශ්‍යය ද?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "අනතුරු ඇඟවීමයි"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "ගොනුව _F"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "ගොනු(ව) විවෘත කරන්න _O"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "ගොනු(ව) එකතු කරන්න"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "ෆෝල්ඩර(ය) එකතු කරන්න"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "ස්ථානය එකතු කරන්න"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "නව ගීත ලැයිස්තුව"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "ගීත ලැයිස්තුව විවෘත කරන්න"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "ගීත ලැයිස්තුව සුරකින්න"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "ඉවත්වන්න _Q"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "සංස්කරණය _E"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "පිරිසිදු කරන්න _C"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "සියල්ල තෝරන්න"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "සියල්ල තේරීම ඉවත් කරන්න"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "තෝරාගත් පිළිවෙළ ප්‍රතිවර්ත කරන්න"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "වරණය"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "ඉවත් කරන්න"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "අවශ්‍ය පරිදි කපා හරින්න"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "සොයන්න _F"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "පිළිවෙළට සකස් කල යුත්තේ"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "මාතෘකාව"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "ගීතයේ අංකය"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "ඇල්බමය"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "ගායකයා"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "දිනය"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "සසම්භාවී"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "රිසි ආකාරයට සකසන්න"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "අභිමතය"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "දර්ශනය කරන්න _V"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "තත්ව දර්ශන තීරුව"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "සමකාරකය"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "සැළසුම් කිරීමේ ප්‍රකාරය"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "නැවත ධාවනය _P"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "අනුපිළිවෙළ"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "රේඛීය"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "ගීත කලවම් කරන්න"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "ඇල්බම කලවම් කරන්න"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "නැවත නැවත ධාවනය කිරීම"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "සියලු ගීත නැවත නැවත ධාවනය කරන්න"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "ගීය නැවත නැවත ධාවනය කරන්න"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "නැවත නැවත ධාවනය නොකරන්න"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "අනුචලන පිලිවෙළින් ධාවනය පෙන්වන්න"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "කර්සරය මගින් ධාවන පිළිවෙළ පෙන්වන්න"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "මෙම ගීතයට පසු නවත්වන්න"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "ධාවනය කල ගීතයට යොමුකරන්න"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "උදව් _H"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "වෙනස්කම් ලොගය _C"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "පිළිබඳ තොරතුරු _A"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "පරිවර්තක _T"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "සොයන්න"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "නවතන්න"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "ධාවනය කරන්න"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "මදකට නතර කරන්න"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "පෙර ගීතය"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "මීළඟ ගීතය"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "අහඹු ලෙස ධාවනය කරන්න"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "පිළිබඳ තොරතුරු"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "නවතන්න"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "උදව්"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "ගීතයේ තොරතුරු"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "ස්ථානය:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "සැකසුම්"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "යොදන්න _A"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "නිමා කරන්න _C"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "පාර-දත්ත"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "වත්කම්"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "ශීර්ෂය:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "නව සිරස් තීරු ශීර්ෂය මෙහි ඇතුළත් කරන්න"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "වර්ගය:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "අයිතම අංකය"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "වාදනය වෙමින් පවතී"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "ඇල්බම රූපය"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "ගායකයා - ඇල්බමය"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "පවත්නා කාලය"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "ගීත අංකය"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "සංගීත කණ්ඩායම / ශිල්පියා"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "ආකෘතිය:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "පෙළගැස්ම:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "වම"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "දකුණ"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "අවලංගු කරන්න _C"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "හරි _O"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "ප්‍රතිදාන පේනු මෘදුකාංගය"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "ප්‍රතිදාන උපකරණය"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "සෑමවිට ම බිට් 8 ශ්‍රව්‍ය ගොනු බිට් 16 ට පරිවර්තනය කරන්න"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "සෑමවිට ම බිට් 16 ශ්‍රව්‍ය ගොනු බිට් 24 ට පරිවර්තනය කරන්න"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "ශබ්දය"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "ශබ්ද පරිපාලන ආකාරය"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "අක්‍රීය කරන්න"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "ගීතය"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "ශබ්ද පරිපාලනය ඉහළ පරාස වලින්"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "ශබ්ද පරිපාලන පූර්ව වර්ධකය"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "සමස්ත පූර්ව වර්ධකය"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "විධාන තීරුව (හෝ ගොනු කළමනාකරණය) මගින්, ගීත ලැස්තුවට ගොනු ඇතුලත් කිරීම"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "පටන්ගන්මෙදී, පෙර සැසිය නැවත අරඹන්න"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "ෆෝල්ඩර එකතු කිරීමේදී, සංරක්ෂණාගාරයෙන් එකතු නොකරන්න"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "\"මෙම ගීතයට පසු නැවතීම\", ස්වයංක්‍රීයව නැවත සකසන්න"
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "නැවත ධාවනය කරන්න"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "හැඩගැස්වීම"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP දාම පිහිටුවීම"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "ප්‍රවේශනය _L"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "වසා තැටිය තුලට හකුලුවන්න"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "පද්ධති තැටි අයිකනය සඟවන්න"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "රුසියානු CP1251 අනාවරණය කිරීම සහ ප්‍රතිකේතනය කිරීම සක්‍රීය කරන්න"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "චීන CP936 අනාවරණය කිරීම සහ ප්‍රතිකේතනය කිරීම සක්‍රීය කරන්න"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "අතුරු මුහුණත නැවුම් වීමේ අනුපාතය (තත්පරයකට වාර)"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "ධාවනය අතරතුර මාතෘකා තීරයේ ඇති වැකිය"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "ධාවනය නැවතූ විට මාතෘකා තීරයේ ඇති වැකිය"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "අතුරු මුහුණත් කෙවෙනිය (වෙනස් වීමට නැවත පණ ගැන්විය යුතුයි)"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "මෙතැනින් මකාදමන්න යන සන්දර්භ මෙනූ අයිතමය සඟවන්න"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "තනි ෆෝල්ඩරයක් තුළට එක් කිරීමේදී ගීත ලැයිස්තු වල නම් ස්වයංක්‍රීයව සකසන්න"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "GUI/Misc"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "අතික්‍රමනය කරන්න"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "පෙරබිම"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "පසුබිම"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "සෙවුම් තීරු/ශබ්ද තීරු වර්ණ"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "මධ්‍යම පැහැ"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "ලා පැහැ"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "අඳුරු පැහැ"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "පාදම"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "පාඨය"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "පටි තීරු පැහැයන්"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "ප්‍රතික්ෂේප කරන්න (GTK රුක් දසුන් තේමාව නැතිවන නමුත් එය ගීතය පරිවර්ථනය පහසු කරවයි)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "ඉරට්ටේ පේළි"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "ඔත්තේ පේළි"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "තෝරාගත් පේළිය"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "තෝරාගත් අකුරු"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "කර්සරය"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "ගීත ලැයිස්තු පැහැයන්"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "පැහැයන්"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "නියුතු සේවාදායකය සක්‍රිය කරන්න"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "නියුතු සේවාදායක ලිපිනය:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "නියුතු සේවාදායක තොට:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "නියුතු සේවාදායක වර්ගය:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "නියුතු සේවාදායක භාවිත නාමය:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "නියුතු සේවාදායක මුරපදය:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "HTTP භාවිත ඒජන්තවරයා"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr "අන්තර්ගත-වර්ග අතර සබැඳීම සංස්කරණය කරන්න"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "ජාලය"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr "කෙටි යතුරු සංයෝජන ආදේශ කරන්න:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr "ක්‍රියාවන්:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr "<Not set>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr "යතුරු සංයෝජන:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "ගෝලීය කෙටි යතුරු සංයෝජන"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -878,122 +903,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "කෙටි යතුරු සංයෝජන"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "සංස්කරණය"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "පිටපත් කිරීමේ අයිතිය"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "කෙවෙනි මෘදුකාංගය"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "සමුහ කල යුත්තේ ..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "අනුපිළිවෙළට සකස් කල යුත්තේ ..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "ආකෘතිය"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "ආරෝහන"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "අවරෝහන"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "DSP කෙවෙනි මෘදුකාංගය තෝරන්න"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "කෙවෙනි මෘදුකාංගය"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "ටැග් ලියන සැකසුම්"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "ID3v2 ලියන්න"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "ID3v1 ලියන්න"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "APEv2 ලියන්න"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "ID3v2 ඉවත්කරන්න"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "ID3v1 ඉවත්කරන්න"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "APEv2 ඉවත්කරන්න"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 සංස්කරණය"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (නිර්දේශිත)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3vI සංකේත ආකේතනය (සාමාන්‍ය භාවිතය iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 ලියන්න"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr "අන්තර්ගත-වර්ග අතර සබැඳීම"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1005,91 +1036,100 @@ msgstr ""
 "වර්ගය පැවතිය හැකි අතර එය DeaDBeeF හි \"stdmpg\" හෝ \"ffmpeg\" කෙවෙනි මෘදුකාංග "
 "භාවිතයෙන් විකේතනය කල යුතුව පැවතිය හැකිය."
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr "සාමාන්‍යය භාවිත වලට නැවත සකසන්න"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr "අන්තර්ගත-වර්ග:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "කෙවෙනි මෘදුකාංග"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr "බොත්තම් සතු ගුණාංග"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr "වර්ණ:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr "අකුරු වල පැහැය:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr "අයිකන:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr "ලේබල:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr "ක්‍රියාව වරණය කරන්න"
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "ගායකයා / ඇල්බම"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "ගීත අංකය"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "නැවත ධාවන පෙලගැස්මට එකතුකරන්න"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "නැවත ධාවන පෙලගැස්මෙන් ඉවත් කරන්න"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "පාර-දත්ත නැවත ගන්න"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "තැටියෙන් ඉවත් කරන්න"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "නව සිරස් තීරුවක් එකතු කරන්න"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "සිරස් තීරුව සංස්කරණය කරන්න"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "සිරස් තීරුව ඉවත් කරන්න"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "පාදක කරගෙන කණ්ඩායම් කිරීම"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "කිසිවක් නැත"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "ගයකයා/දිනය/ඇල්බමය"
 
@@ -1106,11 +1146,11 @@ msgstr "වින්‍යාස කිරීම %s"
 msgid "Default Audio Device"
 msgstr "සාමාන්‍යයෙන් භාවිතා කරන ශ්‍රව්‍ය උපාංගය"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1118,7 +1158,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "ගොනු එකතු කිරීම..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "ඇරඹීම..."
 
@@ -1131,128 +1171,128 @@ msgid "Really close the window?"
 msgstr "කවුළුව නිමාකිරීමට අවශ්‍යද?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[බහු අගයන්]"
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "යතුර"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "වටිනාකම"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[බහු අගයන්]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "ටැග් ලිවීම..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "ක්ෂේත්‍ර නාමය"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "නම:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "ක්ෂේත්‍ර නාම : ලකුණකින් හෝ _ ලකුණකින් ආරම්භ නොකල යුතුය"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "ක්ෂේත්‍රය එකතු කල නොහැක"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "මෙනමින් දැනටමත් ක්ෂේත්‍රයක් පවතී, කරුණාකර වෙනත් නමක් භාවිතා කරන්න."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "ක්ෂේත්‍රය එකතු කරන්න"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "ක්ෂේත්‍රය ඉවත් කරන්න"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "භාවිතය: deadbeef [විකල්ප] [--] [ගොනු(ව)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "විකල්ප:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "--help  හෝ  -h ආධාරක විස්තර (මෙම පණිවිඩය) දර්ශනය කර ඉවත් වන්න\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "--quit ධාවකයෙන් ඉවත්වන්න\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "--version සංස්කරණ තොරතුරු දර්ශනය කර ඉවත් වන්න\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "--play ගීත ධාවනය අරඹන්න\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "--stop ගීත ධාවනය නවත්වන්න\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "--pause ගීත ධාවනය මදකට නතර කරන්න\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "--toggle-pause ධාවනය මදකට නතර කිරීම හා නැවත ධාවනය කිරීම\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr "--play-pause ගීත ධාවනය නවතා ඇත්නම් ධාවනය අරභන්න, නැතිනම් ධාවනය මදකට නවත්වන්න\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "--next ගීත ලැයිස්තුවේ ඇති ඊළඟ ගීතය ධාවනය කරන්න\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "--prev ගීත ලැයිස්තුවේ කළින් ඇති ගීතය ධාවනය කරන්න\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "--random ගීත ලැයිස්තුවේ ඇති ගීත සසම්භාවී ලෙස ධාවනය කරන්න\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "--queue පවතින ගීත(ය) ලැයිස්තුවට නව ගොනු එකතු කරන්න\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
@@ -1260,12 +1300,12 @@ msgstr ""
 "--gui PLUGIN භාවිතා කිරීමට අවශ්‍යය අතුරු මුහුණත සඳහන් කරන්න, සාමාන්‍යයෙන් භාවිතා කරන්නේ \\"
 "\"GTK2\\\"\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "--nowplaying FMT සම්මත ප්‍රතිදානයට ගීතයේ ආකෘතීකරණය කරන ලද නම දර්ශනය කරන්න\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1278,7 +1318,7 @@ msgstr ""
 "\n"
 "පිටපත් කිරීමේ අයිතිය[r], ධාවනය කිරීමට ඉතිරිව ඇති[e]\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1286,28 +1326,24 @@ msgid ""
 msgstr ""
 "උදා:  --nowplaying \"%%a - %%t\" විධානය \"ගායකයා හා ගීතයේ නම\" දර්ශනය කල යුතුය\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"වැඩි විස්තර සඳහා, http://sourceforge.net/apps/mediawiki/deadbeef/index.php?"
-"title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "සාමාන්‍ය භාවිතය"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "ඔව්"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "නැහැ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1343,7 +1379,7 @@ msgstr ""
 "\n"
 "රිසි ආකාරය"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1352,7 +1388,7 @@ msgstr ""
 "\n"
 "දකුණ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1364,7 +1400,7 @@ msgstr ""
 "\n"
 "ඇල්බමය"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1373,7 +1409,7 @@ msgstr ""
 "\n"
 "අවරෝහණ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1382,14 +1418,7 @@ msgstr ""
 "\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "%s pixmap ගොනුව සොයාගත නොහැකිය"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1401,8 +1430,8 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "ගීත අඩංගු සංයුක්ත තැටිය ඇතුළත් කරන්න"
+msgid "Add Audio CD"
+msgstr ""
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1694,8 +1723,8 @@ msgstr "ස්වයංක්‍රීය Samplerate (ඉලක්ක Samplerate
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
-msgstr "රිසි ආකාරයට shell විධාන සකස් කරන්න"
+msgid "Configure Custom Shell Commands"
+msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
@@ -1711,35 +1740,40 @@ msgstr "ශබ්දය වටෙන්ම ඇසීම ක්‍රියා 
 msgid "Enable surround"
 msgstr "ශබ්දය වටෙන්ම ඇසීම සක්‍රීය කරන්න"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "ගොනුව දැනටමත් පවතී. එය මතම ලියන්නද?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "පරිවර්ථක අවවාදයක්"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "කරුණාකර ආකේතකය තෝරන්න"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "පරිවර්ථක දෝෂයක්"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "පරිවර්ථනය කරමින් පවතී..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "ෆෝල්ඩරය සුරකින්න..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "ආකේතක පෙර සැකසුම සුරැකීමට නොහැකි විය"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1747,77 +1781,77 @@ msgstr ""
 "පෙර සැකසුම් ෆෝල්ඩරයේ අවසරයන් පරීක්ෂා කරන්න, වෙනත් නාමයක් ලබා ගැනීමට උත්සාහ කරන්න, හෝ දෘඩ "
 "තැටියේ යම් ඉඩ ප්‍රමාණයක් නිදහස් කරන්න"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "මෙම නමින් තවත් පෙර සැකසුමක් දැනටමත් පවතී. වෙනත් නාමයක් ලබා දෙන්න."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "දෝෂයක්"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "නව ආකේතකය එකතු කරන්න"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "ආකේතකය සංස්කරණය කරන්න"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "පෙර සැකසුම ඉවත් කරන්න"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "මෙම ක්‍රියාව මඟින් තෝරන ලද පෙර සැකසුම මකාදැමීමට නියමිතයි. එය සිදුකරන්නද?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "ආකේතක"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "DSP දාමයට කෙවෙනි මෘදුකාංගය ඇතුළත් කරන්න"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "DSP පෙර සැකසුම සුරැකීමට නොහැකි විය"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "නව DSP පෙර සැකසුම"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "DSP පෙර සැකසුම සංස්කරණය කරන්න"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP පෙර සැකසුම්"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "ප්‍රතිදාන ෆෝල්ඩරය:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr "ගීත අඩංගු ෆෝල්ඩරයට ලියන්න"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr "සංරක්ෂිත ෆෝල්ඩර ආකෘතිය"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "ප්‍රතිදාන ගොනු නාමය:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1828,89 +1862,89 @@ msgstr ""
 "\n"
 "සාමාන්‍යයෙන් භාවිතා කරන දිගු සඳහා ක්ෂේත්‍රය හිස්ව තබන්න (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "ආකේතකය:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP පෙර සැකසුම"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "සමාන්තරව ක්‍රියාත්මක වන වැඩසටහන් ගණන:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "ප්‍රතිදාන ආකෘති ආදර්ශය:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "ප්‍රභව ආකෘතිය පවත්වා ගන්න"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "බිට් 8 ඇති ලකුණු සහිත නිඛිල"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "බිට් 16 ඇති ලකුණු සහිත නිඛිල"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "බිට් 24 ඇති ලකුණු සහිත නිඛිල"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "බිට් 32 ඇති ලකුණු සහිත නිඛිල"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "බිට් 32 ඇති දශම"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "ගොනුව පවතින විට:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Prompt"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "එය මත ලියන්න"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "ආකේතක පෙර සැකසුම් සංස්කරණය කරන්න"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "නම් නොකල ආකේතකය"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "ප්‍රතිදාන ගොනු දිගුව:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "උදා. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "විධාන අතුරු මුහුණත"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1921,7 +1955,7 @@ msgstr ""
 "\n"
 "ආදාන ගොනු සඳහා %i, ප්‍රතිදාන ගොනු සඳහා %o, -සම්මත ආදානය සඳහා"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1932,66 +1966,72 @@ msgstr ""
 "\n"
 "%i - තාවකාලික ආදාන ගොනු නාමය</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "ක්‍රම:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Pipe"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "තාවකාලික ගොනු"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>ටැග් ලියනය</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "DSP පෙර සැකසුම් සංස්කාරකය"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "නම් නොකල DSP පෙර සැකසුම"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "එකතු කරන්න"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "%s pixmap ගොනුව සොයාගත නොහැකිය"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2036,27 +2076,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr "ව්‍යවහාරික shell විධාන"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "සංස්කරණය කරන්න"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "නිමා කරන්න"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "විධානය සංස්කරණය කරන්න"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "විධානය:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2067,17 +2107,17 @@ msgstr ""
 "අත්තනෝමතික shell විධානයකි. එය ප්‍රධාන වැඩසටහන ක්‍රියාත්මක වීම ආරම්භ වූ shell සංදර්හය තුළම "
 "ක්‍රියාත්මක වීමට නියමිතයි. ශීර්ෂ ආකෘතීකරණය භාවිතා කල හැකිය. උදාහරණ ලෙස: xdg-open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "අනන්‍යතාවය"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr "නිදහස් ආරකින් ඇති නමකි, උදා. \\\"My Shell Command\\\""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
@@ -2086,57 +2126,57 @@ msgstr ""
 "විධාන හැඳිනුම, සාමාන්‍යයෙන් එය කෙටි විය යුතුය, උදාහරණ ලෙස \"youtube_open\". සහ එය "
 "අද්විතීය විය යුතුයි."
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr "තනි ගීත"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "තනි ගීතයක් මත වැඩ කරන්න"
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "බහු ගීත"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "බහු ගීත මත වැඩ කරන්න"
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "පරිස්ථානීය"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "පරිස්ථානීය ගොනු මත ක්‍රියාත්මක වේ."
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr "දුරස්ථ"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr "දුරස්ථ ගොනු මත ක්‍රියාත්මක වේ (උදා. http:// streams)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "අයිතමය ප්‍රධාන මෙනුව තුළ පෙනී සිටිය යුතුයි"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2144,72 +2184,72 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "විධානය ඇතුලත් කරන්න"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "මකා දමන්න"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "මෙම ක්‍රියාව මඟින් තෝරන ලද shell විධානය මකාදැමීමට නියමිතයි. එය සිදුකරන්නද?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr "ඉවත් කිරීම තහවුරු කරන්න"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr "අනන්‍යතා ක්ෂේත්‍රය හිස්ව නොතැබිය යුතු අතර අද්විතීය විය යුතුය.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr "මාතෘකාව  හිස්ව නොතැබිය යුතුය.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr "Shell විධානය හිස්ව නොවිය යුතුය.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "වලංගු නොවන අගයන්"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr "සහායක හඬ ආකෘති"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "සියලුම ගොනු (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr "ගොනු(ව) විවෘත කරන්න..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr "ධාවන ලැයිස්තුවට ගොනු(ව) එකතු කරන්න..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr "ධාවන ලැයිස්තුවට ෆෝල්ඩර(ය) එකතු කරන්න..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr "Symlinks අනුගමනය කරන්න"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "තැටියේ තිබෙන ගොනු ඉවත් කරන්න"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -2218,19 +2258,19 @@ msgstr ""
 "\n"
 "(මෙම කතිකාවත GTKUI මාර්ග අපගත කල හැක)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "ගීත ලැයිස්තුව විවෘත කරන්න"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "අනෙකුත් ගොනු (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr "ගීත ලැයිස්තුව මෙනමින් සුරකින්න"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF ගීත ලැයිස්තු ගොනු (*.dbpl)"
 
@@ -2268,102 +2308,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr "කිසිවක් වරණය කර නොමැත."
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr "මෙයින් ප්‍රතිස්ථාපනය කරන්න..."
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr "අඩංගු කරන්න..."
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr "කපන්න"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr "පිටපත් කරන්න"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr "අලවන්න"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr "චලන නවතන්න"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr "ටැබය වම් දෙසට චලනය කරවන්න"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr "ටැබය දකුණු දෙසට චලනය කරවන්න"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr "ටැබය ඉවත් කරන්න"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr "ටැබයේ නම වෙනස් කරන්න"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr "නව ටැබයක් එකතු කරන්න"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr "තීරු ශීර්ෂයන් දර්ශනය කරන්න"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr "පෙට්ටිය එක් අයිතමයකින් විහිදුවන්න"
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr "පෙට්ටිය එක් අයිතමයකින් හකුළුවන්න"
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr "සජාතීය"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr "විහිදුවන්න"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr "පුරවන්න"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr "බොත්තම් හැඩගස්වන්න"
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 7edb027..c1d8053 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/sk/)\n"
 "Language: sk\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "O aplikácii DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Záznam zmien DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr ""
@@ -87,790 +87,817 @@ msgstr "Znulovať predzos"
 msgid "Zero Bands"
 msgstr "Znulovať pásma"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 deň %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dní %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Zastavené | %d stôp | %s celkový čas"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Pozastavené | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d stôp | %s celkový čas"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Nový zoznam stôp"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nový zoznam stôp (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Zlyhalo čítanie súboru Pomocníka"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Zlyhalo načítanie súboru Pomocníka"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Súbor"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Otvoriť súbor(y)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Pridať súbor(y)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Pridať priečinok/priečinky"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Pridať umiestnenie"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Nový zoznam stôp"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Načítať zoznam stôp"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Uložiť zoznam stôp"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Ukončiť"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Vyčistiť"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Vybrať všetky"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Zrušiť výber"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Invertovať výber"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Výber"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Odstrániť"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Orezať"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Nájsť"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Názov"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Interpret"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Náhodné"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Vlastné"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Nastavenia"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Zobraziť"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Stavový panel"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Ekvalizér"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Prehrávanie"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Poradie"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Lineárne"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Opakovať"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Posúvať podľa prehrávanej stopy"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Kurzor podľa prehrávanej stopy"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Zastaviť po tejto stope"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Záznam zmien"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "O _aplikácii"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Zastaviť"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Prehrať"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pozastaviť"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Predošlá"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Ďalšia"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Prehrať náhodnú"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "O aplikácii"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Pomocník"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Vlastnosti stopy"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Použiť"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Zatvoriť"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadáta"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Názov:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Sem zadajte názov stĺpca"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr ""
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Hrá"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Obal albumu"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Interpret - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Trvanie"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Skupina/interpret"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Formát:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Zarovnanie:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Vľavo"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Vpravo"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Výstupný zásuvný modul:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Výstupné zariadenie:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Režim replaygain:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Vypnúť"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Stopa"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Najvyšší replaygain:"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Nastaviť"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Zatvorenie minimalizuje do oznamovacej oblasti"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Prekonať"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Popredie"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Pozadie"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Farby lišty pozície a hlasitosti"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Stredné"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Svetlé"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Tmavé"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Základ"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Text"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Farby pruhu kariet"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Prekonať (nepoužije témy vzhľadu stromového zobrazenia GTK, ale urýchli "
 "vykresľovanie)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Párny riadok"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Nepárny riadok"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Vybraný riadok"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Vybraný text"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Kurzor"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Farby zoznamu stôp"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Zapnúť proxy server"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Adresa proxy servera:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Port proxy servera:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Typ proxy:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Používateľ proxy:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Heslo pre proxy:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Sieť"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -878,122 +905,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Zapísať ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Zapísať ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Zapísať APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Odstrániť ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Odstrániť ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Odstrániť APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Verzia ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (odporúča sa)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Kódovanie znakov ID3v1 (predvolené je iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Zapísať ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1001,91 +1034,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Interpret/album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Č. stopy"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Pridať do frontu prehrávaných"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Odstrániť z frontu prehrávaných"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Znovu načítať metadáta"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Odstrániť z disku"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Pridať stĺpec"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Upraviť stĺpec"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Odstrániť stĺpec"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Zoskupiť podľa"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Žiadne"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Interpret/dátum/album"
 
@@ -1102,11 +1144,11 @@ msgstr ""
 msgid "Default Audio Device"
 msgstr "Predvolené zvukové zariadenie"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1114,7 +1156,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Pridávajú sa súbory..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Inicializuje sa..."
 
@@ -1127,140 +1169,140 @@ msgid "Really close the window?"
 msgstr "Naozaj zatvoriť toto okno?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Kľúč"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr ""
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Možnosti:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help alebo -h    Vypíše túto správu Pomocníka a skončí\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Ukončí prehrávač\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Vypíše informácie o verzii a skončí\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Začne prehrávanie\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Zastaví prehrávanie\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Pozastaví prehrávanie\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Ďalšia stopa v zozname\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Predošlá stopa v zozname\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Náhodná stopa v zozname\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Pridá súbory do existujúceho zoznamu stôp\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 "   --nowplaying FMT   Vypíše formátovaný názov stopy na štand. výstup\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1271,7 +1313,7 @@ msgstr ""
 "                      [l] dĺžka, [n] č. stopy, [y] rok, [c] komentár,\n"
 "                      [r] autorské práva, [e] uplynulo\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1280,26 +1322,24 @@ msgstr ""
 "                      napr.: --nowplaying „%%a - %%t“ by malo vypísať "
 "„interpret - názov“\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Predvolené"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Áno"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Nie"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1314,7 +1354,7 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1322,7 +1362,7 @@ msgstr ""
 "Vľavo\n"
 "Vpravo"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1332,13 +1372,13 @@ msgstr ""
 "Stopa\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1346,14 +1386,7 @@ msgstr ""
 "2.3 (odporúča sa)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Nepodarilo sa nájsť súbor pixmap: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1363,7 +1396,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1656,7 +1689,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1673,111 +1706,116 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr ""
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1785,89 +1823,89 @@ msgid ""
 "Leave the field empty for default (%a - %t)."
 msgstr ""
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr ""
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr ""
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1875,7 +1913,7 @@ msgid ""
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1883,66 +1921,72 @@ msgid ""
 "%i - temporary input file name</small>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr ""
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr ""
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr ""
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Pridať"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nepodarilo sa nájsť súbor pixmap: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1970,27 +2014,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -1999,74 +2043,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2074,90 +2118,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2184,102 +2228,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 05f778e..5cc372b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/deadbeef-"
 "player/language/sl/)\n"
 "Language: sl\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "O programu DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Dnevnik sprememb programa DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Prevajalci programa DeaDBeeF"
@@ -86,44 +86,44 @@ msgstr "Ponastavi predojačevalnik"
 msgid "Zero Bands"
 msgstr "Ponastavi pasove"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Predloge nastavitev"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dan %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dni %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Zaustavljeno | %d skladb | Skupni čas predvajanja: %s"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Premor | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -131,745 +131,772 @@ msgstr ""
 "%s%s %s| %d Hz | %d bitov | %s | %d:%02d / %s | %d skladb | Skupni čas "
 "predvajanja: %s"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Nov seznam predvajanja"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nov seznam predvajanja (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Med branjem datoteke pomoči je prišlo do napake"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Datoteke pomoči ni mogoče naložiti"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Odpri datoteko"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Dodaj datoteko"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Dodaj mapo"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Dodaj mesto"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Nov seznam predvajanja"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Naloži seznam predvajanja"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Shrani seznam predvajanja"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Končaj"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Počisti"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Izberi vse"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Prekliči izbor"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Obrni izbor"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Izbor"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Odstrani"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Obreži"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Najdi"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Naslov"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Številka skladbe"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Izvajalec"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Datum"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Naključno"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Po meri"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Možnosti"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Vrstica stanja"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Uravnalnik"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "Pre_dvajanje"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Vrstni red"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Zaporedno"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Premešaj skladbe"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Premešaj albume"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Ponavljanje"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Drsnik sledi predvajanju"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Kazalnik sledi predvajanju"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Zaustavi po trenutni skladbi"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Skoči na trenutno skladbo"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "Pomo_č"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "Dnevnik _sprememb"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_O programu"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Prevajalci"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Iskanje"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Zaustavi"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Predvajaj"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Premor"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Predhodna"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Naslednja"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Predvajaj naključno"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "O programu"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Končaj"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Pomoč"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Lastnosti skladbe"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Uveljavi"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Zapri"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metapodatki"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Naslov:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Vnesite ime novega stolpca"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Vrsta:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Številka skladbe"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Predvajanje"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Naslovnica albuma"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Izvajalec - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Trajanje"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Št. skladbe"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Skupina / Izvajalec albuma"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Oblika:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Poravnava:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Levo"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Desno"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_V redu"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Izhodni vstavek:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Izhodna naprava:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Vedno pretvori 8-bitni zvok v 16-bitnega"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Zvok"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "ReplayGain:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Onemogočeno"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Skladba"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Prilagajanje vrha ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Predojačanje ReplayGain:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Splošno predojačanje:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "Datoteke privzeto dodaj na ta seznam predvajanja:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Ob zagonu nadaljuj prejšnjo sejo"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Med dodajanjem map ne dodaj datotek iz arhivov"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Predvajanje"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Nastavitve"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Predloga nastavitev verige DSP"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Naloži"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Ob zaprtju skrči v sistemsko vrstico"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Skrij ikono sistemske vrstice"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Hitrost osveževanja vmesnika:"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Besedilo nazivne vrstice med predvajanjem:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Besedilo nazivne vrstice, ko je predvajanje zaustavljeno:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Vstavek vmesnika (zahteva ponovni zagon):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Skrij možnost »Izbriši z diska«"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Samodejno poimenuj seznam prevajanja, ko je dodana le ena mapa"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Omogoči"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Barva"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Ozadje"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Barva vrstice iskanja/glasnosti"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Ozadje"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "1. obroba"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "2. obroba"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Osnova"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Besedilo"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Barva zavihkov"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Omogoči (prepiše temo GTK+, vendar pospeši izrisovanje)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Soda vrstica"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Liha vrstica"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Izbrana vrstica"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Izbrano besedilo"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Kazalnik"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Barva seznama predvajanja"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Barve"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Omogoči posredniški strežnik"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Naslov:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Vrata:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Vrsta:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Uporabniško ime:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Geslo:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Omrežje"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -877,122 +904,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Različica: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Avtorske pravice"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Vstavki"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Oblika"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Naraščajoče"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Padajoče"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Izberite vstavek DSP"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Vstavek"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Nastavitve zapisovalnika oznak"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Zapiši ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Zapiši ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Zapiši APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Odstrani ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Odstrani ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Odstrani APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Različica ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (priporočeno)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Kodiranje znakov ID3v1 (privzeto je iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Zapiši ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1000,91 +1033,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Izvajalec / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Št. skladbe"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Dodaj na seznam predvajanja"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Odstrani s seznama predvajanja"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Ponovno naloži metapodatke"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Odstrani z diska"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Dodaj stolpec"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Uredi stolpec"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Odstrani stolpec"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Združi po"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Ne združi"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Izvajalec/Datum/Album"
 
@@ -1101,11 +1143,11 @@ msgstr "%s"
 msgid "Default Audio Device"
 msgstr "Privzeta zvočna naprava"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1113,7 +1155,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Dodajanje datotek ..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Začenjanje ..."
 
@@ -1126,102 +1168,102 @@ msgid "Really close the window?"
 msgstr "Ali res želite zapreti to okno?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Več vrednosti] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Ključ"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Vrednost"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Zapisovanje oznak ..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Ime:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Imena polj se ne smejo začeti z »:« ali »_«"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Polja ni mogoče dodati"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Polje s tem imenom že obstaja."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Dodaj polje"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Odstrani polje"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Možnosti:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  ali  -h     Izpiše pomoč (to sporočilo).\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Konča predvajalnik.\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Izpiše podatke o različici.\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Začne predvajanje.\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Zaustavi predvajanje.\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Prekine predvajanje.\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Začne/prekine predvajanje\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1229,51 +1271,51 @@ msgstr ""
 "   --play-pause       Začne predvajanje, če je zaustavljeno, v nasprotnem "
 "primeru ga prekine.\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Naslednja skladba s seznama predvajanja.\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Predhodna skladba s seznama predvajanja.\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Naključna skladba s seznama predvajanja.\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Pripne datoteko na seznam predvajanja.\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 "   --nowplaying OBLIKA   Izpiše oblikovano ime trenutno predvajane skladbe.\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
 "                      [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 "                      copy[r]ight, [e]lapsed\n"
 msgstr ""
-"                      OBLIKA (začnite z %%): izv[a]jalec, [t] - naslov, al[b]"
-"um,\n"
+"                      OBLIKA (začnite z %%): izv[a]jalec, [t] - naslov, "
+"al[b]um,\n"
 "                      [l] - trajanje, [n] - številka skladbe, [y] - leto,\n"
 "                      [c] - opomba, avto[r]ske pravice, pr[e]tečen čas\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1282,28 +1324,24 @@ msgstr ""
 "                      npr.: --nowplaying »%%a - %%t« izpiše »izvajalec - "
 "naslov«\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      Za več podatkov si oglejte http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Privzeto"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Da"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Ne"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1329,7 +1367,7 @@ msgstr ""
 "Skupina / Izvajalec albuma\n"
 "Po meri"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1337,7 +1375,7 @@ msgstr ""
 "Levo\n"
 "Desno"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1347,7 +1385,7 @@ msgstr ""
 "Skladba\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1355,7 +1393,7 @@ msgstr ""
 "Naraščajoče\n"
 "Padajoče"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1363,14 +1401,7 @@ msgstr ""
 "2.3 (priporočeno)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Večbitne sličice ni mogoče najti: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1383,7 +1414,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1676,7 +1707,7 @@ msgstr "Samodejna hitrost vzorčenja (prepiše ciljno hitrost vzorčenja)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1693,35 +1724,40 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Datoteka že obstaja. Ali jo želite prepisati?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Opozorilo pretvornika"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Prosimo, izberite kodirnik"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Napaka pretvornika"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Pretvarjanje ..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Izberite mapo ..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Predloge nastavitev kodirnika ni mogoče shraniti"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1729,77 +1765,77 @@ msgstr ""
 "Preverite dovoljenja mape predloge nastavitev, izberite drugo ime ali "
 "sprostite nekaj prostora na disku."
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "Predloga nastavitev s tem imenom že obstaja."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Napaka"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Dodaj nov kodirnik"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Uredi kodirnik"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Odstrani predlogo nastavitev"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Ali ste prepričani, da želite izbrisati izbrano predlogo nastavitev?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Kodirniki"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Dodaj vstavek v verigo DSP"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Predloge nastavitev DSP ni mogoče shraniti."
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Nova predloga nastavitev DSP"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Uredi predlogo nastavitev DSP"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "Predloge nastavitev DSP"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Izhodna mapa:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Ime izhodne datoteke:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1809,89 +1845,89 @@ msgstr ""
 "Pripona (npr. mp3) bo pripeta samodejno.\n"
 "Za privzeto vrednost (%a - %t) pustite polje prazno."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Kodirnik:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "Predloga nastavitev DSP:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Število niti:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Oblika izhodnega vzorca:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Ohrani izvirno obliko"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8-bitno predznačeno celo število"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16-bitno predznačeno celo število"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24-bitno predznačeno celo število"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32-bitno predznačeno celo število"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32-bitna plavajoča vejica"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Če datoteka že obstaja:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Vprašaj"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Prepiši"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Uredi predlogo nastavitev kodirnika"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Neimenovan kodirnik"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Pripona izhodne datoteke:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Na primer: mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Ukazna vrstica:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1901,7 +1937,7 @@ msgstr ""
 "Zgled: lame - %o\n"
 "%i = vhodna datoteka, %o = izhodna datoteka, - = standardni vhod"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1911,66 +1947,72 @@ msgstr ""
 "<small>%o - ime izhodne datoteke\n"
 "%i - začasno ime vhodne datoteke</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Način:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Cevovod"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Začasna datoteka"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "Ogg Vorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Zapisovalnik oznak</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "Urejevalnik predlog nastavitev DSP"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Neimenovana predloga nastavitev DSP"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Dodaj"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Večbitne sličice ni mogoče najti: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1998,27 +2040,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2027,74 +2069,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2102,90 +2144,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2212,102 +2254,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 153214a..0b526da 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/sr/)\n"
 "Language: sr\n"
@@ -21,17 +21,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "O DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s — Дневник измена"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF преводиоци"
@@ -88,44 +88,44 @@ msgstr "Претпојачало на нулу"
 msgid "Zero Bands"
 msgstr "Подручја на нулу"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Поставке"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 дан %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d дана %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Заустављено | %d песама | %s укупно време свирања"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Моно"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Стерео"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d кбпс "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Паузирано | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -133,751 +133,775 @@ msgstr ""
 "%s%s %s| %d херца | %d бита | %s | %d:%02d / %s | %d песама | %s укупно "
 "време свирања"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Нова листа"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Нова листа (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Листа са језичцима"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Листа"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "Делитељ (горе-доле)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "Делитељ (лево-десно)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "Језичци листе"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Својства одабраног"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Приказ омотнице албума"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Дугме"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Неуспело читање датотеке помоћи"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Неуспело отварање датотеке помоћи"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
-"Тренутно, програм обавља позадинске задатке. Уколико га напустите сада ови "
-"задаци ће бити поништени или заустављени, а то може довести до губитка "
-"података."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "Да ли и даље желите да изађете?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Датотека"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Отвори датотеку(е)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Додај датотеку(е)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Додај директоријум(е)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Додај место"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Нова листа"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Учитај листу"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Сачувај листу"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Излаз"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Уређивање"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "О_чисти"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Изабери све"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Поништи избор"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Обрни избор"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Избор"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Уклони"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Одсеци"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Тражи"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Сложи по"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Наслов"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Број песме"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Албум"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Извођач"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Датум"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Случајно"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Прилагођено"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Подешавања"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "П_реглед"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Статусна трака"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Еквилајзер"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "Ре_продукција"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Редослед"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Линијски"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Насумично песме"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Насумично албуми"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Понављање"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Понављај све"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Понављај песму"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "Без понављања"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Клизач прати репродукцију песама"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Показивач прати репродукцију песама"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Заустави после тренутне песме"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Иди на песму која се репродукује"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Помоћ"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "Дневник и_змена"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "О прогр_аму"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Преводиоци"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Тражи"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Заустави"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Пусти"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Паузирај"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Претходна"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Наредна"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Пусти насумично"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "О програму"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Излаз"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Помоћ"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Особине песме"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "Место:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Подешавања"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "С_ачувај промене"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Затвори"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Подаци о песми"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Особине"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Наслов:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Унесите име за нову колону овде"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Врста:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Редни број"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Репродукује се"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Омотнице албума"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Извођач — Албум"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Трајање"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Број песме"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Група / Извођач"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Формат:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Поравнање:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Лево"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Десно"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Поништи"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_У реду"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Излазни додаци:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Излазни уређај"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Увек претварај 8-битни у 16-битни аудио"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Увек претварај 16-битни у 24-битни звук"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Звук"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Replaygain мод:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Онемогући"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Песма"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Replaygain скала вршних вредности"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Replaygain претпојачавач:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Претпојачавач:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Додај датотеке из линије за наредбе или управника датотека у ову листу:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Врати претходну сесију при покретању"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Не учитавај дадотеке из архива приликом додавања директоријума"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "Самопоништавање за „Заустави после тренутне песме“"
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Репродукција"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Подеси"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Поставка за дигиталну обраду"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "У_читај"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "Дигитална обрада звука (DSP)"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Код клика на затвори смести у обавештајну зону"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Не приказуј икону у обавештајној зони"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "Омогући препознавање и снимање за руску кодну страну CP1251"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Омогући препознавање и снимање за кинеску кодну страну CP936"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Освежавање приказа (колико пута у секунди)"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "При репродукцији, испиши на насловној линији: "
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "По заустављеној репродукцији, испиши на насловној линији: "
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Додатак графичког корисничког интерфејса (неопходно поновно покретање)"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Сакриј ставке \"Обриши са диска\" у менију"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Самоименовање листа песама при додавању само једног директоријума"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "Графичко сучеље/Разно"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Замени подразумевано"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Боја текста"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Позадина"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Траке за премотавање/гласноћу"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Средње"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Светло"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Тамно"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Основа"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Текст"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Боје одвајања листова"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Замени подразумевано (губе се ГТК теме погледа стабла, али се добија бржи "
 "приказ)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Паран ред"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr " Непаран ред"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Одабран ред"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Одабран текст"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Показивач"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Боје листе"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Боје"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Омогући прокси сервер"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Адреса прокси сервера:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Порт прокси сервера:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Тип проксија:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Прокси корисничко име:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Прокси лозинка:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr "Придружене пречице тастатуре:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr "Радња:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr "Комбинација тастера:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "Опште пречице тастатуре"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -885,122 +909,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "Пречице тастатуре"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Издање:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Ауторска права"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Додаци"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "Групиши по..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "Сложи по..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Облик:"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Растуће"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Опадајуће"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Избор додатка за дигиталну обраду"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Додатак"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Подешавања писача ознака"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Уписуј ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Уписуј ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Уписуј APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Уклони ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Уклони ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Уклони APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 верзија"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Препоручено)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 кодирање знакова (подразумевано је iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Уписуј ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1008,91 +1038,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr "Врати на подразумевано"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr "Врста садржаја:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "Додаци:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr "Својства дугмета"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr "Боја:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr "Боја текста:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr "Икона:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr "Ознака:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr "Изаберите радњу"
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Извођач / Албум"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Број песме"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Додај у заказано"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Уклони из заказаног"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Поново учитај податке о песми"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Уклони са диска"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Додај колону"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Уреди колону"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Уклони колону"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Групиши по"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Поништи груписање"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Извођач/Датум/Албум"
 
@@ -1109,11 +1148,11 @@ msgstr "Подеси %s"
 msgid "Default Audio Device"
 msgstr "Подразумевани звучни уређај"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1121,7 +1160,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Додавање датотека..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Иницијализација..."
 
@@ -1134,140 +1173,140 @@ msgid "Really close the window?"
 msgstr "Желите ли заиста да затворите овај прозор?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Вишеструке вредности] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Кључ"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Вредност"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[Вишеструке вредности] "
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Уписујем ознаке..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "Назив поља"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Име:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Имена поља не могу почињати знацима : или _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Не могу да додам поље"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Поље са истим именом већ постоји. Дајте пољу друго име."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Додај поље"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Уклони поље"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "Употреба: deadbeef [опције] [--] [датотека(е)] \n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Опције:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  или  -h     Прикажи ову помоћ и изађи\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Напусти плејер\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Прикажи инфо о верзији и изађи\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Репродукуј\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Заустави репродукцију\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Паузирај репродукцију\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Паузирај\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 "   --play-pause       Започни репродукцију ако је заустављена, и обратно\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Наредна песма из листе\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Претходна песма из листе\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Насумично песма из листе\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Додај датотеку(е) у постојећу листу\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr "   --gui ДОДАТАК       Додатак граф. сучеља — подразумеван је „GTK2“\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Испиши уређено име песме на стд. излаз\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1278,7 +1317,7 @@ msgstr ""
 "                      [l]-трајање, [n]-бр.песме, [y]-година, [c]-примедба,\n"
 "                      [r]-ауторска права, [e]преостало време\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1287,28 +1326,24 @@ msgstr ""
 "                      Н.пр.: --nowplaying \"%%a - %%t\" ће исписати "
 "\"Извођач - Наслов\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                     додатне информације на http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Подразумевано"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Да"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Не"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1334,7 +1369,7 @@ msgstr ""
 "Група / Извођач\n"
 "Прилагођено"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1342,7 +1377,7 @@ msgstr ""
 "Лево\n"
 "Десно"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1352,7 +1387,7 @@ msgstr ""
 "Песма\n"
 "Албум"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1360,7 +1395,7 @@ msgstr ""
 "Растући\n"
 "Опадајући"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1368,14 +1403,7 @@ msgstr ""
 "2.3 (Препоручено)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Не могу пронаћи датотеку са битмапираном сликом: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1388,8 +1416,8 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "Додај звучни диск"
+msgid "Add Audio CD"
+msgstr ""
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1682,8 +1710,8 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
-msgstr "Подесите произвољне наредбе љуске"
+msgid "Configure Custom Shell Commands"
+msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
@@ -1700,35 +1728,40 @@ msgstr ""
 msgid "Enable surround"
 msgstr "Омогући окружујући звук"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Датотека са истим именом већ постоји. Да ли да препишем преко ње?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Упозорење прекодера"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Одаберите кодер"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Грешка прекодера"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Прекодирам..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Одаберите директоријум..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Није успело чување поставки кодера"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1736,77 +1769,77 @@ msgstr ""
 "Проверите дозволе директоријума за чување поставки или дајте поставки друго "
 "име или проверите да ли имате довољно слободног простора на диску"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "Поставка са истим именом већ постоји. Дајте поставци друго име."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Грешка"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Додај нови кодер"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Уреди кодер"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Уклони поставку"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Овом радњом ћете обрисати одабрану поставку. Да ли то заиста желите?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Кодери"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Додајте додатак у оквир за дигиталну обраду"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Није успело чување поставки за дигиталну обраду"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Нова поставка за дигиталну обраду"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Уреди поставку за дигиталну обраду"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "Поставке за дигиталну обраду"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Излазни директоријум:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr "Упиши у директоријум где је и изворна нумера"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr "Сачувај структуру директоријума"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Име датотеке на излазу:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1817,89 +1850,89 @@ msgstr ""
 "За подразумевано именовање датотеке (%a - %t) \n"
 "оставите ово поље празним."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Кодер:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "Поставка за дигиталну обраду:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Број нити:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Излазна дубина бита узорка:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Као у изворној датотеци"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "Означена 8-битно целобројна"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "Означена 16-битно целобројна"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "Означена 24-битно целобројна"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "Означена 32-битно целобројна"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32-битно једнострука"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Уколико датотека већ постоји:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Питај ме"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Препиши"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Уреди поставке кодера"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Неименован кодер"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Наставак имена датотеке на излазу:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Нпр. mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Линија наредбе:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1909,7 +1942,7 @@ msgstr ""
 "На пример: lame - %o\n"
 "%i за улазну датотеку, %o за излазну датотеку, - за стандардни улаз (stdin)"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1919,66 +1952,72 @@ msgstr ""
 "<small>%o - име излазне датотеке\n"
 "%i - привренено име улазне датотеке</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Метод:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Цев"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Привремена датотека"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "Уписуј APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "Уписуј ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "Уписуј ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Писач ознака</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "Уређивач поставки за дигиталну обраду"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Неименована поставка за дигиталну обраду"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Додај"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Не могу пронаћи датотеку са битмапираном сликом: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2016,27 +2055,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr "Прилагођене наредбене линије"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "Уређивање"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "Затвори"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "Уреди наредбу"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "Наредба:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2047,17 +2086,17 @@ msgstr ""
 "Произвољна наредба љуске — Извршиће се у окружењу љуске из којег је и главни "
 "програм покренут. Форматирање наслова је могуће. Нпр: xdg-open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "ИБ:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr "Слободно-дато име. Нпр. „Моја наредба љуске“"
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
@@ -2066,57 +2105,57 @@ msgstr ""
 "ИБ наредбе је обично је врло кратак (нпр. „youtube_open“), а мора бити "
 "јединствен."
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr "Појединачно нумере"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "Радње на нумери."
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "Више нумера"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "Радње на нумерама."
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "Локално"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "Радње са датотекама на Вашем рачунару."
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr "Удаљено"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr "Радње са удаљеним датотекама (нпр. http://нека.адреса.или.токови)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "Ставка ће се приказати у главном менију"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2124,72 +2163,72 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Додај наредбу"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "Обриши"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "Овом радњом ћете обрисати одабрану наредбу. Да ли то заиста желите?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr "Потврдите уклањање"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr "ИБ не може бити празан и мора бити јединствен.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr "Поље „Наслов“ не може бити празно\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr "Поље наредбе љуске не може бити празно.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "неисправна вредност"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr "Подржане звучне датотеке"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "Све датотеке (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr "Отвори датотеку(е)..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr "Додај датотеку(е) у листу..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr "Додај директоријум(е) у листу..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr "Прати меке везе"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "Обриши датотеке са диска"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -2197,19 +2236,19 @@ msgstr ""
 "Датотеке ће бити обрисане. Да ли сте сигурни?\n"
 "(Овај дијалог може да се искључи у подешавањима додатка „GTKUI“)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "Учитај листу"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "Друге датотеке (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr "Сачувај листу као"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Датотека са листом (*.dbpl)"
 
@@ -2236,102 +2275,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr "Ништа није изабрано."
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr "Замени са..."
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr "Уметни..."
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr "Исеци"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr "Умножи"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr "Убаци"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr "Закључај померања"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr "Помери језичак улево"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr "Помери језичак удесно"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr "Уклони језичак"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr "Преименуј језичак"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr "Додај нови језичак"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr "Прикажи заглавља колона"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr "Прошири бокс једном ставком"
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr "Сузи бокс за 1 ставку"
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr "Истородно"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr "Прошири"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr "Попуни"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr "Подесите дугме"
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/sr at latin.po b/po/sr at latin.po
index a1bc7f9..6b15a98 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/deadbeef-"
 "player/language/sr at latin/)\n"
 "Language: sr at latin\n"
@@ -21,17 +21,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "O DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s — Dnevnik izmena"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF prevodioci"
@@ -88,44 +88,44 @@ msgstr "Pretpojačalo na nulu"
 msgid "Zero Bands"
 msgstr "Područja na nulu"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dan %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dana %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Zaustavljeno | %d pesama | %s ukupno vreme sviranja"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Pauzirano | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -133,748 +133,775 @@ msgstr ""
 "%s%s %s| %d herca | %d bita | %s | %d:%02d / %s | %d pesama | %s ukupno "
 "vreme sviranja"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Nova lista"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nova lista (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Neuspelo čitanje datoteke pomoći"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Neuspelo otvaranje datoteke pomoći"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Otvori datoteku(e)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Dodaj datoteku(e)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Dodaj direktorijum(e)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Dodaj mesto"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Nova lista"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Učitaj listu"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Sačuvaj listu"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Izlaz"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Uređivanje"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "O_čisti"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Izaberi sve"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Poništi izbor"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Obrni izbor"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Izbor"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Ukloni"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Odseci"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Traži"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Naslov"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Izvođač"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Datum"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Slučajno"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Prilagođeno"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Podešavanja"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "P_regled"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Statusna traka"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Ekvilajzer"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "Re_produkcija"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Redosled"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Linijski"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Ponavljanje"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Klizač prati reprodukciju pesama"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Pokazivač prati reprodukciju pesama"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Zaustavi posle trenutne pesme"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Idi na pesmu koja se reprodukuje"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "Dnevnik i_zmena"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "O progr_amu"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Prevodioci"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Traži"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Zaustavi"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Pusti"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Pauziraj"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Prethodna"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Naredna"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Pusti nasumično"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "O programu"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Izlaz"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Pomoć"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Osobine pesme"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "S_ačuvaj promene"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Podaci o pesmi"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Osobine"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Naslov:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Unesite ime za novu kolonu ovde"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Vrsta:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr ""
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Reprodukuje se"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Omotnice albuma"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Izvođač — Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Trajanje"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Broj pesme"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Grupa / Izvođač"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Poravnanje:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Levo"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Desno"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Poništi"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_U redu"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Izlazni dodaci:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Izlazni uređaj"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Replaygain mod:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Onemogući"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Pesma"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Replaygain skala vršnih vrednosti"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Dodaj datoteke iz linije za naredbe ili upravnika datoteka u ovu listu:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Vrati prethodnu sesiju pri pokretanju"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Reprodukcija"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Podesi"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Kod klika na zatvori smesti u obaveštajnu zonu"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Ne prikazuj ikonu u obaveštajnoj zoni"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Pri reprodukciji, ispiši na naslovnoj liniji: "
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Po zaustavljenoj reprodukciji, ispiši na naslovnoj liniji: "
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Sakrij stavke \"Obriši sa diska\" u meniju"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Zameni podrazumevano"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Boja teksta"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Pozadina"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Trake za premotavanje/glasnoću"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Srednje"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Svetlo"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Tamno"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Osnova"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Tekst"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Boje odvajanja listova"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Zameni podrazumevano (gube se GTK teme pogleda stabla, ali se dobija brži "
 "prikaz)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Paran red"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr " Neparan red"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Odabran red"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Odabran tekst"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Pokazivač"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Boje liste"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Boje"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Omogući proksi server"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Adresa proksi servera:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Port proksi servera:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Tip proksija:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Proksi korisničko ime:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Proksi lozinka:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Mreža"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -882,122 +909,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Autorska prava"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Dodaci"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Upisuj ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Upisuj ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Upisuj APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Ukloni ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Ukloni ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Ukloni APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 verzija"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Preporučeno)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 kodiranje znakova (podrazumevano je iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Upisuj ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1005,91 +1038,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Izvođač / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Broj pesme"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Dodaj u zakazano"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Ukloni iz zakazanog"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Ponovo učitaj podatke o pesmi"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Ukloni sa diska"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Dodaj kolonu"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Uredi kolonu"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Ukloni kolonu"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Grupiši po"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Poništi grupisanje"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Izvođač/Datum/Album"
 
@@ -1106,11 +1148,11 @@ msgstr ""
 msgid "Default Audio Device"
 msgstr "Podrazumevani zvučni uređaj"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1118,7 +1160,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Dodavanje datoteka..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Inicijalizacija..."
 
@@ -1131,139 +1173,139 @@ msgid "Really close the window?"
 msgstr "Želite li zaista da zatvorite ovaj prozor?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Ključ"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Vrednost"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr ""
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Opcije:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  ili  -h     Prikaži ovu pomoć i izađi\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Napusti plejer\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Prikaži info o verziji i izađi\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Reprodukuj\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Zaustavi reprodukciju\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Pauziraj reprodukciju\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Naredna pesma iz liste\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Prethodna pesma iz liste\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Nasumično pesma iz liste\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Dodaj datoteku(e) u postojeću listu\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Ispiši uređeno ime pesme na std. izlaz\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1274,7 +1316,7 @@ msgstr ""
 "                      [l]-trajanje, [n]-br.pesme, [y]-godina, [c]-primedba,\n"
 "                      [r]-autorska prava, [e]preostalo vreme\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1283,26 +1325,24 @@ msgstr ""
 "                      N.pr.: --nowplaying \"%%a - %%t\" će ispisati "
 "\"Izvođač - Naslov\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Da"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Ne"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1317,7 +1357,7 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1325,7 +1365,7 @@ msgstr ""
 "Levo\n"
 "Desno"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1335,13 +1375,13 @@ msgstr ""
 "Pesma\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1349,14 +1389,7 @@ msgstr ""
 "2.3 (Preporučeno)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Ne mogu pronaći datoteku sa bitmapiranom slikom: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1369,7 +1402,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1662,7 +1695,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1679,111 +1712,116 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr ""
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1791,89 +1829,89 @@ msgid ""
 "Leave the field empty for default (%a - %t)."
 msgstr ""
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr ""
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr ""
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1881,7 +1919,7 @@ msgid ""
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1889,66 +1927,72 @@ msgid ""
 "%i - temporary input file name</small>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr ""
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr ""
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr ""
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Dodaj"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Ne mogu pronaći datoteku sa bitmapiranom slikom: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1976,27 +2020,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2005,74 +2049,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2080,90 +2124,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2190,102 +2234,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index a24f12d..781f95a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/sv/)\n"
 "Language: sv\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Om DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeadBeeF %s Ändrligslogg"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF översättare"
@@ -87,793 +87,820 @@ msgstr "Ingen förstärkning"
 msgid "Zero Bands"
 msgstr "Nollställ band"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Inställningar"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dag %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dagar %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Stoppad | %d spår | %s total speltid"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Pausad | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d spår | %s total speltid"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Ny spellista"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Ny spellista (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Misslyckades vid läsning av hjälpfil"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Kunde inte läsa hjälpfil"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Varning"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Öppna fil(er)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Lägg till fil(er)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Lägg till katalog(er)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Lägg till plats"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Ny spellista"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Läs in spellista"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Spara spellista"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "A_vsluta"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "R_ensa"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Markera allt"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Avmarkera allt"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Invertera markering"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Markering"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Ta bort"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Beskär"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Sök"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Titel"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Spårnummer"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Artist"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Slumpa"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Anpassad"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Egenskaper"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Visa"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Statusrad"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Uppspelning"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Ordning"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Linjär"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Blanda spår"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Blanda albm"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Upprepning"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Markering följer uppspelning"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Markering följer uppspelning"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Stanna efter nuvarande"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Ändringslogg"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Om"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Sök"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Spela"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Paus"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Föregående"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Nästa"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Spela slumpad"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Om"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Avsluta"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Spåregenskaper"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Verkställ"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Stäng"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Ange ny kolumntitel här"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr ""
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Spelar"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Albumillustration"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Artist - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Längd"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Spårnummer"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Artist"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Justering:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Vänster"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Höger"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Instick för uppspelning:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Enhet för uppspelning:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Ljud"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Läge för justering av uppspelningsvolym:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Avaktivera"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Spår"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Övre gräns för justering av uppspelningsvolym"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Läge för justering av förstärkning:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Lägg till filer från kommandoraden (eller filhanteraren) till den här "
 "spellistan:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Återuppta föregående session vid uppstart"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Uppspelning"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Inställningar"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Inställningar för DSP-kedja"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Stäng minimerar till systembricka"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Dölj ikon i systembrickan"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Text i titelraden vid uppspelning:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Text u titelraden utan uppspelning:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Göm menyvalet \"radera från disk\""
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Överbrygga"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Förgrund"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Bakgrund"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Färg på sök-/volym-fält"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Mitten"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Ljus"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Mörk"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Bas"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Text"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Färg för flikrad"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Överbrygga (GTK-baserat tema för trädvy försvinner men renderingen går "
 "fortare)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Jämn rad"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Ojämn rad"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Markerad rad"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Markerad text"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Markör"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Spellistans färger"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Färger"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Aktivera proxyserver"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Adress för proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Port för proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Proxytyp:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Användarnamn för proxy:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Lösenord för proxy:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Nätverk"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -881,122 +908,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Instick"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Format"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Välj DSP-instick"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Instick"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Inställningar för tagg-skrivare"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Skriv ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Skriv ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Skriv APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Rensa ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Rensa ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Rensa APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 version"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Rekomenderad)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 teckenkodning (iso8859-1 är standard)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Skriv ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1004,91 +1037,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Artist / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Spårnummer"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Lägg till i uppspelningskön"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Ta bort från uppspelningskön"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Ladda om metadata"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Ta bort från disk"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Lägg till kolumn"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Redigera kolumn"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Ta bort kolumn"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Gruppera efter"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Ingen"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Artist/Datum/Album"
 
@@ -1105,11 +1147,11 @@ msgstr "Inställningar för %s"
 msgid "Default Audio Device"
 msgstr "Standardljudenhet"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1117,7 +1159,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Lägger till filer..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Förbereder..."
 
@@ -1130,139 +1172,139 @@ msgid "Really close the window?"
 msgstr "Ska fönstret verkligen stängas?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Nyckel"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Värde"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Lägg till fält"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Ta bort fält"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Flaggor:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  eller  -h     Visa hjälp (detta meddelande) och avsluta\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Stäng spelare\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Skriv ut versionsinformation och avsluta\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Påbörja uppspelning\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Stoppa uppspelning\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Pausa uppspelning\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Nästa spår i spellista\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Föregående spår i spellista\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Slumpa spår i spellista\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Lägg till fil(er) i nuvarande spellista\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Skriv formaterat spårnamn till standard ut\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1273,7 +1315,7 @@ msgstr ""
 "                      längd (l), spårnummer (n), år (y), kommentar (c),\n"
 "                      utgiven av (r), förfluten tid (e)\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1282,26 +1324,24 @@ msgstr ""
 "                      e.x.: --nowplaying \"%%a - %%t\" bör visa \"artist - "
 "titel\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Standard"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Ja"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Nej"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1316,7 +1356,7 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1324,7 +1364,7 @@ msgstr ""
 "Vänster\n"
 "Höger"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1334,13 +1374,13 @@ msgstr ""
 "Spår\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1348,14 +1388,7 @@ msgstr ""
 "2.3 (rekomenderad)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Kunde inte hitta pixmap-fil: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1368,7 +1401,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1661,7 +1694,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1678,111 +1711,116 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Välj katalog..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr ""
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1790,89 +1828,89 @@ msgid ""
 "Leave the field empty for default (%a - %t)."
 msgstr ""
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr ""
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr ""
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1880,7 +1918,7 @@ msgid ""
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1888,66 +1926,72 @@ msgid ""
 "%i - temporary input file name</small>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr ""
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr ""
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr ""
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Lägg till"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Kunde inte hitta pixmap-fil: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1975,27 +2019,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2004,74 +2048,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2079,90 +2123,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2189,102 +2233,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 48e0304..59fb84b 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/te/)\n"
 "Language: te\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "డెడ్‌బీఫ్ %s గురించి"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "డెడ్‌బీఫ్ %s మార్పులచిట్టా"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "డెడ్‌బీఫ్ అనువాదకులు"
@@ -85,788 +85,815 @@ msgstr "ప్రిఆంప్ సున్నాచేయి"
 msgid "Zero Bands"
 msgstr "బ్రాండ్లను సున్నాచేయి"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "ప్రిసెట్లు"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 రోజు %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d రోజులు %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "ఆపివేయబడింది | %d ట్రాక్‌లు | %s మొత్తం ప్లేటైమ్"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "మోనో"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "స్టీరియో"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "నిలిపివేయబడింది | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr "%s%s %s| %dHz | %d బిట్ | %s | %d:%02d / %s | %d ట్రాక్‌లు | %s మొత్తం ప్లేటైమ్"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "కొత్త పాటలజాబితా"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "కొత్త పాటలజాబితా (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "సహాయక ఫైలును చదువుతుండగా విఫలమైంది"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "సహాయక ఫైల్ లోడుచేయుటలో విఫలమైంది"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "హెచ్చరిక"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "ఫైల్ (_F)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "ఫైళ్ళ(ను) తెరువు (_O)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "ఫైళ్ళ(ను) జతచేయి"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "సంచయా(ల)ను జతచేయి"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "స్థానమును జతచేయి"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "కొత్త పాటలజాబితా"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "పాటలజాబితాను నింపు"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "పాటలజాబితాను దాచు"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "నిష్క్రమించు (_Q)"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "సవరించు(_E)"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "శుభ్రంచేయి (_C)"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "అన్నీ ఎంచుకో"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "ఎంపికను రద్దుచేయి"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "ఎంపికను తారుమారుచేయి"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "ఎంపిక"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "తొలగించు"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "కత్తిరించు"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "కనుగొను (_F)"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "శీర్షిక"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "పాట సంఖ్య"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "ఆల్బమ్"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "కళాకారుడు"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "తేదీ"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "యాదృచ్ఛికం"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "అనురూపితం"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "ప్రాధాన్యతలు"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "వీక్షణం (_V)"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "స్థితి పట్టీ"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "ఈక్విలైజర్"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "ప్లేబాక్(_P)"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "క్రమం"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "ఒకే వరుసలో ఉన్నవి"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "పాటలను యాదృచ్ఛికపరుచు"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "ఆల్బములను యాదృచ్ఛికపరుచు"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "ఆవృతీకరణ"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "దీని తరువాత ఆపివేయి"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "తరువాత పాటకి వెళ్ళు"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "సహాయం (_H)"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "మార్పుచిట్టా (_C)"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "GPLv2 (_G)"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "LGPLv2.1 (_L)"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "గురించి (_A)"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "అనువాదకులు (_T)"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "వెతుకు"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "ఆపు"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "ప్లే"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "నిలిపివేయి"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "మునుపటి"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "తరువాతి"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "యాదృచ్ఛికంగా ప్లేచేయి"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "గురించి"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "నిష్క్రమించు"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "సహాయం"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "ట్రాక్ లక్షణాలు"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "అమరికలు"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "అనువర్తించు (_A)"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "మూసివేయి (_C)"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "మెటాడేటా"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "గుణములు"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "శీర్షిక:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "కొత్త నిలువువరుస శీర్షికను ఇక్కడ ప్రవేశపెట్టండి"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "రకం:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "అంశపు సూచీ"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "ప్లేచేస్తున్నది"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "ఆల్బమ్ చిత్రం"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "కళాకారుడు - ఆల్బమ్"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "నిడివి"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "పాట సంఖ్య"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "బ్యాండ్ / ఆల్బమ్ కళాకారుడు"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "ఫార్మేట్:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "అనుగుణం:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "ఎడమ"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "కుడి"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "రద్దుచేయి (_C)"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "సరే (_O)"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "అవుట్‌పుట్ ప్లగిన్:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "అవుట్‌పుట్ పరికరం:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "ఎల్పప్పుడూ 8 బిట్ ఆడియోని 16 బిట్‌కి పరివర్తించు"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "ధ్వని"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "రిప్లైగెయిన్ రీతి:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "అచేతనంచేయి"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "ట్రాక్"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "రిప్లైగెయిన్ పీక్ స్కేల్"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "రిప్లైగెయిన్ ప్రీఆంప్:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "గ్లోబల్ ప్రీఆంప్:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "ఆదేశ వరుస (లేదా ఫైల్ నిర్వాహకము) నుండి ఫైళ్ళను ఈ పాటలజాబితాకు జతచేయి"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "ప్రారంభములో మునుపటి కొనసాగిన కాలాన్ని పునఃప్రారంభించు"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "సంచయాలను జతచేస్తున్నపుడు సంగ్రహాలను జతచేయవద్దు"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "ప్లేబాక్"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "స్వరూపించు"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP చైన్ ప్రిసెట్"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "నింపు (_L)"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "తిరస్కరించు"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "ముందుభాగము"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "నేపథ్యం"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "పాఠ్యం"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "ఎంచుకున్న అడ్డవరుస"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "ఎంచుకున్న పాఠ్యం"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "కర్సరు"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "పాటలజాబితా రంగులు"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "రంగులు"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "ప్రోక్సీ సేవికను చేతనపరుచు"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "ప్రోక్సీ సేవిక చిరునామా:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "ప్రోక్సీ సేవిక పోర్టు:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "ప్రోక్సీ రకం:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "ప్రోక్సీ వాడుకరిపేరు:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "ప్రోక్సీ సంకేతపదం:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "నెట్‌వర్క్"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -874,122 +901,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "ప్లగిన్‌లు"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "ID3v2 వ్రాయి"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "ID3v1 వ్రాయి"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "APEv2 వ్రాయి"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 వర్షన్"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (సిఫారసుచేయబడింది)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 అక్షరపు ఎన్‌కోడింగ్ (iso8859-1 అనేది అప్రమేయము)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 వ్రాయి"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -997,91 +1030,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "కళాకారుడు / ఆల్బమ్"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "ట్రాక్ సంఖ్య"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "ప్లేబాక్ వరుసకు జతచేయి"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "ప్లేబాక్ వరుస నుండి తొలగించు"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "మెటాడేటాను మళ్ళీ నింపు"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "డిస్కు నుండి తొలగించు"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "నిలువువరుసను జతచేయి"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "నిలువువరుసను సవరించు"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "నిలువువరుసను తొలగించు"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "ఏదీకాదు"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "కళాకారుడు/తేదీ/ఆల్బమ్"
 
@@ -1098,11 +1140,11 @@ msgstr ""
 msgid "Default Audio Device"
 msgstr "అప్రమేయ ఆడియా పరికరం"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1110,7 +1152,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "ఫైళ్ళను జతచేస్తున్నది..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "ఆరంభిస్తున్నది..."
 
@@ -1123,139 +1165,139 @@ msgid "Really close the window?"
 msgstr "నిజంగానే విండో మూసివేయాలా?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "కీ"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "విలువ"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr ""
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "ఐచ్ఛికాలు:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  or  -h     సహాయాన్ని ముద్రించు (ఈ సందేశమును) మరియు నిష్క్రమించు\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             ప్లేయర్ నుండి నిష్క్రమిస్తుంది\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          వర్షన్ సమాచారాన్ని ముద్రించి, నిష్క్రమించు\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             ప్లేబాక్ ప్రారంభించు\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             ప్లేబాక్ ఆపుము\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            ప్లేబాక్ నిలిపివేయి\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             పాటలజాబితాలో తదుపరి పాట\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             పాటలజాబితాలో మునుపటి పాట\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           పాటల జాబితాలో యాదృచ్ఛిక పాట\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            ఉన్నటువంటి పాటలజాబితాకు ఫైళ్ళను జతచేయి\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1263,33 +1305,31 @@ msgid ""
 "                      copy[r]ight, [e]lapsed\n"
 msgstr ""
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr ""
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "అప్రమేయం"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "అవును"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "కాదు"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1304,7 +1344,7 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1312,7 +1352,7 @@ msgstr ""
 "ఎడమ\n"
 "కుడి"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1322,13 +1362,13 @@ msgstr ""
 "ట్రాక్\n"
 "ఆల్బమ్"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1336,14 +1376,7 @@ msgstr ""
 "2.3 (సిఫారసుచేయబడింది)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1353,7 +1386,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1646,7 +1679,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1663,111 +1696,116 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr ""
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1775,89 +1813,89 @@ msgid ""
 "Leave the field empty for default (%a - %t)."
 msgstr ""
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr ""
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr ""
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1865,7 +1903,7 @@ msgid ""
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1873,66 +1911,72 @@ msgid ""
 "%i - temporary input file name</small>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr ""
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr ""
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr ""
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "జతచేయి"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1960,27 +2004,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -1989,74 +2033,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2064,90 +2108,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2174,102 +2218,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 28647a6..0e1e366 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# brk <burakgarci at gmail.com>, 2013
-# brk <burakgarci at gmail.com>, 2013
+# Burak <burakgarci at gmail.com>, 2013
+# Burak <burakgarci at gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/tr/)\n"
 "Language: tr\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "DeaDBeef %s Hakkında"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s Sürüm Notları"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF'i Çevirenler"
@@ -87,44 +87,44 @@ msgstr "Ön Amfiyi Sıfırla"
 msgid "Zero Bands"
 msgstr "Bantları Sıfırla"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Önayarlar:"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 gün %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d gün %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Durduruldu | %d parça |toplam çalma zamanı: %s"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Duraklatıldı"
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -132,747 +132,774 @@ msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d parça | %s toplam çalma "
 "zamanı"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Yeni Çalma Listesi"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Yeni Çalma Listesi (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Sekmeli çalma listesi"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Çalma listesi"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "Çalma listesi sekmeleri"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Seçim özellikleri"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Albüm kapağı görünümü"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Buton"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Yardım dosyası okunurken hata oluştu"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Yardım dosyası yüklenirken hata oluştu"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "Hala çıkmak istiyor musunuz?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Uyarı"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Dosya"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "Dosy_a(lar) aç"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Dosya(lar) ekle"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Dizin(ler) ekle"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Konum ekle"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Yeni çalma listesi"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Çalma listesi yükle"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Çalma listesini kaydet"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Çıkış"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "Düz_enle"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Temizle"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Tümünü seç"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Tüm seçimleri kaldır"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Seçimi ters çevir"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Seçim"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Kaldır"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Kes"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Bul"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Sırala"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Başlık"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Parça Numarası"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Albüm"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Sanatçı"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Tarih"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Rastgele"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Özel"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Görünüm"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Durum çubuğu"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Ekolayzır"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Oynatım"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Sıralama"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Sıralı"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Parçaları karıştır"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Albümleri karıştır"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Tekrar"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Liste takibi oynatım"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "İmleç takibi oynatım"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Çalan parçadan sonra dur"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Çalan parçaya git"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Sürüm notları"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Hakkında"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "Çe_virenler"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Arama"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Dur"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Çal"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Duraklat"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Önceki"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Sonraki"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Rastgele Oynatım"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Hakkında"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Çıkış"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Yardım"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Parça Özellikleri"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Uygula"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "_Kapat"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Üstveri"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Özellikler"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Başlık:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Yeni sütun başlığını giriniz"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Yaz:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Öğe İndeksi"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Çalıyor"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Albüm Kapağı"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Sanatçı - Albüm"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Süre"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Parça Numarası"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Bant / Albüm Sanatçısı"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Biçim:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Hizalama:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Sol"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Sağ"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Vazgeç"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_Tamam"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Çıktı eklentisi"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Çıktı aygıtı"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "8 bit sesi her zaman 16 bite çevir"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Ses"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Ses gücü sabitleme kipi:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Devre dışı"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Parça"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Ses gücü sabitleme en yüksek limit"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "ReplayGain preamp:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Genel önamfi:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Bu çalma listesine komut satırından (veya dosya yöneticisinden) dosyalar "
 "ekle:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Açılışta önceki oturum ile devam et"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Dizin eklerken arşivden ekleme"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Oynatım"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Yapılandırma"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP Zinciri Önayarları"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Yükle"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Çıkışta bildirim alanına küçült"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Bildirim alanı simgesini gizle"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Arayüz tazeleme oranı (saniyede defa)"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Oynatım sırasındaki başlık çubuğu metni:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Durdurulduğunda başlık çubuğu metni:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "GUI Eklentisi (yeniden başlatınca geçerli olur)"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Diskten sil girdisini\" sağ tık menüsünde\" gösterme"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Bir dizin eklendiğinde şarkı listesini otomatik isimlendir"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Üstüne bindir"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Önplan"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Arkaplan"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Gezinti-çubuğu/Ses çubuğu renkleri"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Orta"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Açık"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Koyu"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Temel"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Metin"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Sekme şerit renkleri"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Üstüne bindir (GTK tema görünümü kaybolur, fakat çalma hızlanır)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Tüm satırlar"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Tek satır"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Seçili satır"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Seçili metin"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "İmleç"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Çalma listesi rengi"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Renkler"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Vekil Sunucu Etkin"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Vekil Sunucu Adresleri:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Vekil Sunucu Portu:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Vekil Türü:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Vekil Kullanıcı Adı:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Vekil Şifresi:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Ağ"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -880,122 +907,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Sürüm:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Telif hakkı"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Eklentiler"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Biçim"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "Artan"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "Azalan"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "DSP Eklentisini Seçin"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Eklenti"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Etiket Yazma Tercihleri"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "ID3v2 Yaz"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "ID3v1 Yaz"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "APEv2 Yaz"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "ID3v2 şeridi"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "ID3v1 şeridi"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "APEv2 şeridi"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 sürümü"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Önerilen)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 karakter kodlaması (varsayılan iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 Yaz"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1003,91 +1036,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Sanatçı / Albüm"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Parça No"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Çalma kuyruğuna ekle"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Çalma kuyruğundan kaldır"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Üstveriyi tekrar yükle"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Diskten sil"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Sütun ekle"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Sütunu düzenle"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Sütunu kaldır"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Gruplandırma ölçütü"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Hiçbiri"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Sanatçı/Tarih/Albüm"
 
@@ -1104,11 +1146,11 @@ msgstr "%s'i yapılandır"
 msgid "Default Audio Device"
 msgstr "Varsayılan Ses Aygıtı"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1116,7 +1158,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Dosyalar ekleniyor..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Başlatılıyor..."
 
@@ -1129,141 +1171,141 @@ msgid "Really close the window?"
 msgstr "Pencere gerçekten kapatılsın mı?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[çoklu değerler]"
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Tuş"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Değer"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Etiketler yazılıyor..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "İsim:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Alan isimleri : veya _ ile başlayamaz"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Alan eklenemez"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Bu isimde bir alan mevcut, lütfen başka bir isimle tekrar deneyin."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Alan ekle"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Alan sil"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Seçenekler:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  veya  -h     Yardımı yazdır (bu mesajı) ve çık\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Oynatıcıyı kapat\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Sürüm bilgilerini yazdır ve çık\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Oynatımı başlat\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Oynatımı durdur\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause             Oynatımı duraklat\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     Duraklamayı geç\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr "--play-pause Durdurulmuşsa çal, değilse duraklamayı geç\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Çalma listesinde sonraki parça\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Çalma listesinde önceki parça\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Çalma listesinde rastgele parça\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Çalma listesine parça(lar) ekle\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 "   --nowplaying FMT   Değiştirilmiş dosya adını standard çıktıya (stdout) "
 "yazdır\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1274,7 +1316,7 @@ msgstr ""
 "                      [u]zunluk, parça[n]umarası, [y]ıl, y[o]rum,\n"
 "                      teli[f]hakkı, [g]eçmiş\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1283,28 +1325,24 @@ msgstr ""
 "                      e.g.: --şimdi çalıyor \"%%a - %%t\" yazdırır \"sanatçı "
 "- başlık\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"daha fazla bilgi için http://sourceforge.net/apps/mediawiki/deadbeef/index."
-"php?title=Title_Formatting adresine bakabilirsiniz\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Varsayılan"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Evet"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Hayır"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1330,7 +1368,7 @@ msgstr ""
 "Grup / Albüm Sanatçısı\n"
 "Özel"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1338,7 +1376,7 @@ msgstr ""
 "Sol\n"
 "Sağ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1348,7 +1386,7 @@ msgstr ""
 "Parça\n"
 "Albüm"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1356,7 +1394,7 @@ msgstr ""
 "Artan\n"
 "Azalan"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1364,14 +1402,7 @@ msgstr ""
 "2.3 (Tavsiye edilen)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Resim dosyası bulunamıyor: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1384,7 +1415,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1677,7 +1708,7 @@ msgstr "Otomatik örnekleme oranı (hedef örnekleme oranının üzerine yazıl
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1694,35 +1725,40 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Dosya mevcut. Üzerine yazılsın mı?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Dönüştürücü uyarısı"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Lütfen bir kodlayıcı seçin"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Dönüştürücü hatası"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Dönüştürülüyor..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Dizin seçin..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Kodlayıcı önayarları kaydedilemedi"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1730,77 +1766,77 @@ msgstr ""
 "Dizinin erişim izinlerini kontrol edin, başka bir isim deneyin veya yeterli "
 "disk alanını boşaltın"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "Bu isimle bir önayar mevcut. Başka bir isim seçin."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Hata"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Yeni kodlayıcı ekle"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Kodlayıcıyı düzenle"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Önayarı kaldır"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Seçtiğiniz önayar silinecek. Bunu yapmak istediğinizden emin misiniz?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Kodlayıcılar"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "DSP zincirine eklenti ekle"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "DSP önayarı kaydedilemedi"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Yeni DSP Önayarı"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "DSP Önayarını Düzenle"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP Önayarları"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Çıktı dizini:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Çıktı dosya adı:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1810,89 +1846,89 @@ msgstr ""
 "Dosya uzantısı (.mp3 gibi) otomatik olarak eklenecektir.\n"
 "Öntanımlı olanı kullanmak için bu alanı boş bırakın (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Kodlayıcı:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP önayarı:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Thread sayısı:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Çıktı örneği biçimi:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Kaynak biçimini koru"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 bit signed int"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 bit signed int"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 bit signed int"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 bit signed int"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 bit float"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Dosya mevcut olduğunda:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "İstem"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Üstüne yaz"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Kodlayıcının Önayarlarını Düzenle"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "İsimsiz Kodlayıcı"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Oluşacak dosyanın uzantısı:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "mp3 gibi"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Komut satırı:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1903,7 +1939,7 @@ msgstr ""
 "girdi dosyası için %i, çıktı dosyası için %o, stdin (standard girdi) için - "
 "for"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1913,66 +1949,72 @@ msgstr ""
 "<small>%o - oluşacak dosyanın adı\n"
 "%i - geçici girdi dosyasının adı</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Yöntem:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Boru"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Geçici dosya"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Etiket yazıcı</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "DSP Önayar Düzenleyicisi"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "İsimsiz DSP Önayarı"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Ekle"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Resim dosyası bulunamıyor: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2000,27 +2042,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2029,74 +2071,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2104,90 +2146,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2214,102 +2256,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/ug.po b/po/ug.po
index 7b8e9fd..eea0e47 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/deadbeef-player/"
 "language/ug/)\n"
 "Language: ug\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "DeaDBeeF %s ھەققىدە"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s نى ئۆزگەرتىش خاتىرىسى"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF تەرجىمانلىرى"
@@ -85,44 +85,44 @@ msgstr "ئالدىن كۈچەيتىشنى نۆل قىلىش"
 msgid "Zero Bands"
 msgstr "بەلۋاغلارنى نۆل قىلىش"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "ئالدىن تەڭشەشلەر"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 كۈن %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d كۈن %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "توختىغان  | %d  نەغمە  | %s جەمئىي قويۇش ۋاقتى"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "يەككە يوللۇق ئاۋاز"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "ستېرېئو"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "ۋاقىتلىق توختىدى | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -130,749 +130,776 @@ msgstr ""
 "%s%s %s| %d گېرتس | %d بىت | %s | %d:%02d / %s | %d نەغمە | %s جەمئىي قويۇش "
 "ۋاقتى"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "يېڭى قويۇش تىزىمى"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "يېڭى قويۇش تىزىمى(%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "ياردەم ھۆججىتىنى ئوقۇۋاتقاندا مەغلۇپ بولدى"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "ياردەم ھۆججىتىنى ئوقۇش مەغلۇپ بولدى."
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "ئاگاھلاندۇرۇش"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "ھۆججەت(_F)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "ھۆججەت(لەر)نى ئاچ(_O)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "ھۆججەت(لەر)نى قوشۇش"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "قىسقۇچ(لار)نى قوشۇش"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "ئورۇن قوشۇش"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "يېڭى قويۇش تىزىمى"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "قويۇش تىزىمىنى ئوقۇش"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "قويۇش تىزىمىنى ساقلاش"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "چېكىن(_Q)"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "تەھرىر(_E)"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "تازىلا(_C)"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "ھەممىنى تاللا"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "ھەممىنى تاللىما"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "تاللاشنى ئۆرۈ"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "تاللانما"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "چىقىرىۋەت"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "قىرقىش"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "ئىزدە(_F)"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "ماۋزۇ"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "ناخشا نومۇرى"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "ئالبوم"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "ئورۇنلىغۇچى"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "چېسلا"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "قالايمىقان"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "ئىختىيارى"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "مايىللىق"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "كۆرۈنۈش(_V)"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "ھالەت بالدىقى"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "تەڭشىگۈچ"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "قوي(_P)"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "تەرتىپلە"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "سىزىقلىق"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "نەغمىنى تەرتىپسىز قويۇش"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "ئالبومنى تەرتىپسىز قويۇش"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "قايتىلاۋاتىدۇ"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "سىيرىغۇچ قويۇۋاتقىنىغا ئەگەشسۇن"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "نۇربەلگە قويۇۋاتقىنىغا ئەگەشسۇن"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "ھازىرقىسى تاماملانغاندا توختىتىش"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "نۆۋەتتىكى نەغمىگە سەكرەش"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "ياردەم(_H)"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "ئۆزگىرىش خاتىرىسى(_C)"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "ھەققىدە(_A)"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "تەرجىمانلار(_T)"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "ئىزدە"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "توختا"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "قوي"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "ۋاقىتلىق توختا"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "ئالدىنقى"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "كېيىنكى"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "تەرتىپسىز قويۇش"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "ھەققىدە"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "ئاخىرلاشتۇرۇش"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "ياردەم"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "نەغمە خاسلىقى"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "تەڭشەكلەر"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "قوللان(_A)"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "ياپ(_C)"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "مېتا سانلىق-مەلۇماتى"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "خاسلىق"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "ماۋزۇ:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "يېڭى ئىستون ماۋزۇسىنى بۇ يەرگە كىرگۈزۈڭ"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "تىپى:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "تۈر ئىندېكسى"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "قويۇۋاتىدۇ"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "ئالبوم مۇقاۋىسى"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "ئورۇنلىغۇچى - ئالبوم"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "ۋاقتى"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "نەغمە نومۇرى"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "مۇزىكا ئەترىتى / ئالبوم ئورۇنلىغۇچى"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "پىچىم:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "توغرىلاش:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "سول"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "ئوڭ"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "ئەمەلدىن قالدۇر(_C)"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "جەزملە(_O)"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "چىقىرىش قىستۇرمىسى:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "چىقىرىش ئۈسكۈنىسى:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "8 بىتلىق ئۈننى ھەمىشە 16 بىتلىق ئۈنگە ئايلاندۇرۇش"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "ئاۋاز"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Replaygain ھالىتى:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "ئىناۋەتسىز"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "نەغمە"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "قويۇشنى كۈچەيتىش مىقدارىنىڭ ئەڭ چوڭ قىممىتىنى تەڭشەش"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "قويۇش مىقدارىنى ئالدىن كۈچەيتىش:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "ئومۇمىي ئالدىن كۈچەيتىش:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "بۇيرۇق قۇرىدىن(ياكى ھۆججەت باشقۇرغۇدىن) ھۆججەت(لەر)نى بۇ قويۇش تىزىمىغا "
 "قوشۇش:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "باشلانغاندا ئالدىنقى ئەڭگىمەنى داۋام قىلسۇن"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "قىسقۇچتىن قوشۇۋاتقاندا ئارخىپتىن قوشما"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "قويۇش"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "سەپلە"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP زەنجىرىنىڭ ئالدىن تەڭشىشى"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "يۈكلە(_L)"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "كۆزنەك يېپىلغاندا سىستېما قوندىقىغا كىرسۇن"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "سىستېما قونداق سىنبەلگىسىنى يوشۇر"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "كۆرۈنمەيۈزنى يېڭىلاش تېزلىكى(ھەر سېكۇنتتىكى قېتىم سانى)"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "قويۇۋاتقان چاغدىكى ماۋزۇ بالدىقى تېكىستى:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "توختىغان چاغدىكى ماۋزۇ بالدىقى تېكىستى:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "GUI قىستۇرمىسى (ئۆزگەرتىلگەندىن كېيىن قايتا باشلاش زۆرۈر):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "«دىسكىدىن ئۇچۇر» دېگەن مەزمۇن تىزىملىك تۇرىنى يوشۇر"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "يەككە مۇندەرىجە قوشۇلغاندا قويۇش تىزىمىنىڭ ئاتىنى ئاپتوماتىك بەلگىلە"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "قاپلاش"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "ئالدى كۆرۈنۈش"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "تەگلىك"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "ئىزدەش بالدىقى/ئاۋاز چوڭلۇقى بالدىقى"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "ئوتتۇرا"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "ئاق"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "قارا"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "ئاساسى"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "تېكىست"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "بەتكۈچنىڭ رەڭگى"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "قاپلاش(GTK نىڭ دەرەخسىمان كۆرۈنۈشىنىڭ ئۆرنىكى يوقىلىدۇ، بىراق سىزىش تېزلىكى "
 "تېزلىشىدۇ)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "جۈپ قۇر"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "تاق قۇر"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "تاللانغان قۇر"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "تاللانغان تېكىست"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "نۇربەلگە"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "قويۇش تىزىمىنىڭ رەڭلىرى"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "رەڭلەر"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "ۋاكالەتچى مۇلازىمېتىرنى ئىناۋەتلىك قىلىش"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "ۋاكالەتچى مۇلازىمېتىرنىڭ ئادرېسى:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "ۋاكالەتچى مۇلازىمېتىرنىڭ ئېغىزى:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "ۋاكالەتچىنىڭ تىپى:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "ۋاكالەتچىنىڭ ئىشلەتكۈچى ئاتى:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "ۋاكالەتچى ئىمى:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "تور"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -880,122 +907,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "نەشرى: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "نەشر ھوقۇقى"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "قىستۇرما"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "پىچىمى"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "ئۆسكۈچى"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "كېمەيگۈچى"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "DSP قىستۇرمىسىنى تاللاش"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "قىستۇرما"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "خەتكۈش يازغۇچ تەڭشىكى"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "ID3v2 نى يېزىش"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "ID3v1 نى يېزىش"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "APEv2 نى يېزىش"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "ID3v2 نى ئۆچۈرۈۋېتىش"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "ID3v1 نى ئۆچۈرۈۋېتىش"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "APEv2 نى ئۆچۈرۈۋېتىش"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 نەشرى"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (تەۋسىيە قىلىنىدۇ)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 ھەرپ كودلىشى (كۆڭۈلدىكى قىممىتى iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 نى يېزىش"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1003,91 +1036,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "ئورۇنلىغۇچى / ئالبوم"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "نەغمە نومۇرى"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "قويۇش قاتارىغا قوشۇش"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "قويۇش قاتارىدىن چىقىرىۋېتىش"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "مېتا سانلىق-مەلۇماتنى قايتا ئوقۇش"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "دىسكىدىن چىقىرىۋېتىش"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "ئىستون قوشۇش"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "ئىستون تەھرىرلەش"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "ئىستوننى ئۆچۈر"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "گۇرۇپپىلاش"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "يوق"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "ئورۇنلىغۇچى/چېسلا/ئالبوم"
 
@@ -1104,11 +1146,11 @@ msgstr "%s نى سەپلەش"
 msgid "Default Audio Device"
 msgstr "كۆڭۈلدىكى ئۇن ئۈسكۈنىسى"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1116,7 +1158,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "ھۆججەتلەرنى قوشۇۋاتىدۇ…"
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "دەسلەپلەشتۈرۈۋاتىدۇ…"
 
@@ -1129,102 +1171,102 @@ msgid "Really close the window?"
 msgstr "كۆزنەكنى راستلا ياپامسىز؟"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[بىر قانچە قىممەت] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "ئاچقۇچ"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "قىممەت"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "خەتكۈچلەرنى يېزىۋاتىدۇ…"
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "ئاتى:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "سوز بۆلىكى ئاتى : ياكى _ بىلەن باشلانماسلىقى كېرەك"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "سوز بۆلىكى قوشقىلى بولمىدى"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "بۇنداق ئاتى بار سوز بۆلىكى مەۋجۇت، باشقا ئاتنى سىناپ كۆرۈڭ."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "سوز بۆلىكى قوشۇش"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "سوز بۆلىكىنى چىقىرىۋېتىش"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "تاللانمىلار:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  ياكى  -h     مۇشۇ ياردەمنى كۆرسىتىپ ئاخىرلىشىدۇ\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             قويغۇنى ئاخىرلاشتۇرىدۇ\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          نەشر ئۇچۇرىنى بېسىپ چىقىرىپ ئاخىرلىشىدۇ\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             قويۇشنى باشلايدۇ\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             قويۇشنى توختىتىدۇ\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            قويۇشنى ۋاقىتلىق توختىتىدۇ\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     ۋاقىتلىق توختىتىشنى ئالماشتۇرىدۇ\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1232,40 +1274,40 @@ msgstr ""
 "   --play-pause       قويۇۋاتقان بولسا ۋاقىتلىق توختىتىدۇ، باشقا ھالەتنىمۇ "
 "ۋاقىتلىق توختىتىدۇ\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             قويۇش تىزىمىدىكى كېيىنكى ناخشا\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             قويۇش تىزىمىدىكى ئالدىنقى ناخشا\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           قويۇش تىزىمىدىكى ناخشىنى تەرتىپسىز قويىدۇ\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            ھۆججەت(لەر) نى قويۇش تىزىمىغا قوشىدۇ\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
-"   --nowplaying FMT   پىچىلغان نەغمە ئاتىنى ئۆلچەملىك چىقىرىش ئۈسكۈنىسى"
-"(stdout) غا چىقىرىدۇ\n"
+"   --nowplaying FMT   پىچىلغان نەغمە ئاتىنى ئۆلچەملىك چىقىرىش "
+"ئۈسكۈنىسى(stdout) غا چىقىرىدۇ\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1276,7 +1318,7 @@ msgstr ""
 "                      [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 "                      copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1285,28 +1327,24 @@ msgstr ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      تېخىمۇ كوپ ئۇچۇرلار ئۈچۈن http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting گە قاراڭ\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "كۆڭۈلدىكى"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "ھەئە"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "ياق"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1332,7 +1370,7 @@ msgstr ""
 "مۇزىكا ئەترىتى / ئورۇنلىغۇچى\n"
 "ئىختىيارىي"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1340,7 +1378,7 @@ msgstr ""
 "سول\n"
 "ئوڭ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1350,13 +1388,13 @@ msgstr ""
 "نەغمە\n"
 "ئالبوم"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
 msgstr "چوڭىيىش/كىچىكلەش"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1364,14 +1402,7 @@ msgstr ""
 "2.3 (تەۋسىيە قىلىنىدۇ)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "pixmap ھۆججىتىنى تاپقىلى بولمىدى: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1384,7 +1415,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1678,7 +1709,7 @@ msgstr "ئاپتوماتىك ئەۋرىشكە تېزلىكى (‹نىشان ئە
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1695,35 +1726,40 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "مەزكۇر ھۆججەت مەۋجۇت. قاپلامسىز؟"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "ئايلاندۇرغۇچ ئاگاھلاندۇرۇشى"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "كودلىغۇچ تاللاڭ"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "ئايلاندۇرغۇچ خاتالىقى"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "ئايلاندۇرۇۋاتىدۇ…"
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "قىسقۇچ تاللاش…"
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "كودلىغۇچ ئالدىن تەڭشىشىنى ساقلاش مەغلۇپ بولدى"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1731,77 +1767,77 @@ msgstr ""
 "ئالدىن تەڭشەش قىسقۇچىنىڭ ئىمتىيازلىرىنى تەكشۈرۈڭ، باشقا ماۋزۇ تاللاڭ ياكى "
 "دىسكىنى ئازراق بىكارلاڭ"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "ئوخشاش ئاتلىق ئالدىن تەڭشەش مەۋجۇت. باشقا بىرنى تاللاڭ."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "خاتالىق"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "يېڭى كودلىغۇچ قوشۇش"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "كودلىغۇچ تەھرىرلەش"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "ئالدىن تەڭشەشنى چىقىرىۋېتىش"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "بۇ مەشغۇلاتتا تاللانغان ئالدىن تەڭشەش ئۆچۈرۈلىدۇ. راستلا ئۆچۈرەمسىز؟"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "كودلىغۇچ"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "يېڭى قىستۇرمىنى DSP زەنجىرىگە قوشۇش"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "DSP ئالدىن تەڭشىشىنى ساقلاش مەغلۇپ بولدى"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "يېڭى DSP ئالدىن تەڭشىشى"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "DSP ئالدىن تەڭشىشىنى تەھرىرلەش"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP ئالدىن تەڭشەشلىرى"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "چىقىرىش قىسقۇچى:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "چىقىرىش ھۆججىتىنىڭ ئاتى:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1811,89 +1847,89 @@ msgstr ""
 "كېڭەيتىلمە ئاتى (.mp3 دېگەندەك) ئاپتوماتىك قوشۇلىدۇ.\n"
 "قۇرۇق بولسا كۆڭۈلدىكىسى ئىشلىتىلىدۇ (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "كودلىغۇچ:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP ئالدىن تەڭشىشى"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "جەريان(threads) سانى:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "چىقىرىش ئەۋرىشكىسىنىڭ پىچىمى:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "مەنبەنىڭ پىچىمىدەك بولسۇن"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 بىتلىق ئالامىتى بار پۈتۈن سان"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 بىتلىق ئالامىتى بار پۈتۈن سان"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 بىتلىق ئالامىتى بار پۈتۈن سان"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 بىتلىق ئالامىتى بار پۈتۈن سان"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 بىتلىق لەيلىمە كەسىر سان"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "ھۆججەت مەۋجۇت بولسا:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "ئەسكەرتىش"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "قاپلاش"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "كودلىغۇچ ئالدىن تەڭشىشىنى تەھرىرلەش"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "ماۋزۇسىز كودلىغۇچ"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "چىقىرىش ھۆججىتىنىڭ كېڭەيتىلمە ئاتى:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "يەنى mp3 دېگەندەك"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "بۇيرۇق قۇرى:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1903,7 +1939,7 @@ msgstr ""
 "مىسال: lame - %o\n"
 "%i كىرىش ھۆججىتى، %o چىقىرىش ھۆججىتى, - for stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1913,66 +1949,72 @@ msgstr ""
 "<small>%o - چىقىرىش ھۆججىتىنىڭ ئاتى\n"
 "%i - ۋاقىتلىق كىرگۈزۈش ھۆججىتىنىڭ ئاتى</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "ئۇسۇل:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "تۇرۇبا"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "ۋاقىتلىق ھۆججەت"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>خەتكۈش يازغۇچ</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "DSP ئالدىن تەڭشىكىنى تەھرىرلىگۈچ"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "نامسىز DSP ئالدىن تەڭشىشى"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "قوش"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "pixmap ھۆججىتىنى تاپقىلى بولمىدى: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2010,27 +2052,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2039,74 +2081,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2114,90 +2156,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2224,102 +2266,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index da7755d..3c01c0f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# Maks Lyashuk <m_lyashuk at ukr.net>, 2014
 # Yarema aka Knedlyk <yupadmin at gmail.com>, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/deadbeef-"
 "player/language/uk/)\n"
 "Language: uk\n"
@@ -20,17 +21,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Про DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s Список Змін"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Перекладачі DeaDBeeF"
@@ -87,44 +88,44 @@ msgstr "Скинути підсилення на нуль"
 msgid "Zero Bands"
 msgstr "Скинути частоти на нуль"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Типові значення"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 день %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d дні %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Зупинено | %d треків | %s повна тривалість програвання"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Моно"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Стерео"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps"
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "На паузі |"
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -132,748 +133,776 @@ msgstr ""
 "%s%s %s| %dГц | %d біт | %s | %d:%02d / %s | %d треків | %s повна тривалість "
 "програвання"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Новий список програвання"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Новий список програвання (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
-msgstr ""
+msgstr "Список програвання"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr ""
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
-msgstr ""
+msgstr "Показ обкладинки альбому"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
-msgstr ""
+msgstr "Спектр"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr "Панель гучності"
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Невдача при читанні файлу допомоги"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Не можу прочитати файл допомоги"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
-msgstr ""
+msgstr "Ви досі хочете вийти?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Попередження"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Файл"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Відкрити файл(и)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Додати файл(и)"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Додати теку(и)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Додати URL-посилання"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Новий список програвання"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Завантажити список програвання"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Зберегти список програвання"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "_Закінчити"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Редагувати"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Очистити"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Вибрати все"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Забрати вибирання всього"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Інвертувати виділення"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Вибір"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Вилучити"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Вилучити невиділене"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "_Знайти"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
-msgstr ""
+msgstr "Сортувати за"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Назва"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Номер треку"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Альбом"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Виконавець"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Дата"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Випадково"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Користувацьке"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Вигляд"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Рядок стану"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Еквалайзер"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "_Програвання"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Порядок"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Одне за одним"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Перемішати треки"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Перемішати треки"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Повторювати"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
-msgstr ""
+msgstr "Повторювати все"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
-msgstr ""
+msgstr "Повторювати одну пісню"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
-msgstr ""
+msgstr "Не повторювати"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Прокручувати поточну пісню"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Виділяти поточну пісню"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Зупинити піcля поточного"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr "Зупинити після поточного треку"
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr "Зупинити після поточного альбому"
+
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Перескочити на поточний трек"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "_Допомога"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Впроваджені зміни"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "_Про"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Перекладачі"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Пошук"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Стоп"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Програвати"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Попереднє"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Наступне"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Програвати випадково"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Про"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Вийти"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Допомога"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Властивості треків"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
-msgstr ""
+msgstr "Розташування:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Налаштування"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "_Застосувати"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "З_акрити"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Метадані"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Властивості"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Назва:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Введіть назву нової колонки тут"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Індекс"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Програвання"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Обкладинка альбому"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Виконавець - Альбом"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Тривалість"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Номер треку"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Гурт / Альбом Виконавець"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Формат:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Вирівнювання:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "По лівому краю"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "По правому краю"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Плагін виводу:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Пристрій виводу:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Завжди конвертувати 8 біт аудіо до 16 біт"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
-msgstr ""
+msgstr "Завжди конвертувати 16-бітне аудіо до 24-бітного"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Звук"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Режим автовирівнювання гучності:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Виключити"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Трек"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Використовувати пікове значення"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 дБ"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 дБ"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Режим автовирівнювання гучності:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Глобальне вирівнювання"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Додати файли з командної стрічки (або менеджера файлів) до цього списку "
 "програвання:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Відновити попередню сесію на старті"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Не додавати з архіву при додаванні тек"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Програвання"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Налаштувати"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "Типові значення ланцюга DSP"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Завантаження"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Закрити мінімізує до сист. лотка"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Ховати іконку системного лотка"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
+msgid "Enable Russian CP1251 detection and recoding"
+msgstr "Увімкнути виявлення та декодування кирилиці CP1251"
+
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
-msgstr ""
+msgstr "Увімкнути виявлення та декодування китайської CP936"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "Частота оновлення інтерфейсу (разів за секунду)"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "Текст заголовку панелі під час програвання:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "Текст заголовку панелі під час призупинення:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Додаток GUI (для змін потрібно перезавантажити):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
-msgstr ""
+msgstr "Програвач"
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Закривати список програвання середньою клавішею миші"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
-msgstr ""
+msgstr "Використовувати жирний шрифт для треку, що програється"
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Ховати пункт контекстного меню \"Вилучити з диску\""
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Автоматично назвати список програвання при додаванні одної теки"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
+"Автоматично підлаштовувати розміри колонок в залежності від розміру вікна"
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
-msgstr ""
+msgstr "GUI / Різне"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Перезаписати"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Передній план"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Тло"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Кольори Рядка Пошуку/Регулятора Гучності"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Середньо"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Легко"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Темно"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "Основний"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Текст"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "Кольори смужки вкладок"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Перезаписати (втрачаються  налаштування GTK, але пришвидшується візуалізація)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Парний рядок"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Непарний рядок"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Вибраний рядок"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Вибраний текст"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Курсор"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Кольори списку програвання"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "Кольори"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "Включити сервер проксі"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "Адреса сервера проксі:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "Порт сервера проксі:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "Тип проксі:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "Назва користувача проксі:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "Пароль користувача проксі:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "Мережа"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
-msgstr ""
+msgstr "Задані комбінації клавіш:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
-msgstr ""
+msgstr "Дія:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
-msgstr ""
+msgstr "<Не встановлено>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
-msgstr ""
+msgstr "Комбінація клавіш:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
-msgstr ""
+msgstr "Глобальні гарячі клавіші"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -881,122 +910,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
-msgstr ""
+msgstr "Гарячі клавіші"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "Версія: "
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "Авторські права"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "Додатки"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
-msgid "Group By ..."
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+msgid "Group By ..."
+msgstr "Групувати за ..."
+
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
-msgstr ""
+msgstr "Сортувати за..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "Формат"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "В порядку зростання"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "В порядку спадання"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "Вибрати додаток DSP"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "Додаток"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "Налаштування записувача мітки"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "Вписати ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "Вписати ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "Вписати APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "Вирізати ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "Вирізати  ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "Вирізати APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "Версія ID3v2"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Рекомендовано)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Кодування символів у ID3v1 (типово є iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "Вписати ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1004,91 +1039,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
-msgstr ""
+msgstr "Скинути до типових"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
-msgstr ""
+msgstr "Додатки:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
-msgstr ""
+msgstr "Параметри кнопки"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
-msgstr ""
+msgstr "Колір:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
-msgstr ""
+msgstr "Колір тексту:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
-msgstr ""
+msgstr "Піктограма:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
-msgstr ""
+msgstr "Мітка:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
+msgstr "Оберіть дію"
+
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Виконавець / Альбом"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Номер треку"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "Додати до черги програвання"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "Вилучити з черги програвання"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "Перезавантажити метадані"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Вилучити з диску"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Додати колонку"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Редагувати колонку"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Вилучити колонку"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Групувати по"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Нічого"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Виконавець/Дата/Альбом"
 
@@ -1105,19 +1149,19 @@ msgstr "Налаштувати %s"
 msgid "Default Audio Device"
 msgstr "Типовий пристрій Аудіо"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr ""
+msgstr "Ви змінили комбінації клавіш, проте не зберегли внесені зміни."
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
-msgstr ""
+msgstr "Ви дійсно впевнені що хочете продовжити без збереження?"
 
 #: ../plugins/gtkui/progress.c:56
 msgid "Adding files..."
 msgstr "Додавання файлів"
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Ініціалізація..."
 
@@ -1130,103 +1174,103 @@ msgid "Really close the window?"
 msgstr "Дійсно закрити вікно?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[Різні значення] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Клавіша"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Значення"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "Записую мітки..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
-msgstr ""
+msgstr "Назва файлу"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "Назва:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "Назви полів не повинні починатися з : або _"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "Неможливо додати поле"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "Поле з такою назвою вже існує, введіть іншу назву."
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "Додати поле"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "Вилучити поле"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
-msgstr ""
+msgstr "Використання: deadbeef [опції] [--] [файл(и)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Опції:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr ""
 "   --help  або  -h     Показати цю допомогу (це повідомлення) і вийти\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             Вийти з програвача\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          Показати інформацію про версію і вийти\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             Почати програвання\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             Зупинити програвання\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            Призупинити програвання\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     перемикання паузи\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
@@ -1234,38 +1278,40 @@ msgstr ""
 "   --play-pause       Почати програвання якщо зупинено, включити паузу в "
 "протилежному випадку\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             Наступна пісня в списку програвання\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             Попередня пісня в списку програвання\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           Випадкова пісня в списку програвання\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            Додати файл(и) до існуючого списку програвання\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
+"   --gui PLUGIN       Вказує яке доповнення інтерфейсу використовувати, "
+"типовим є \"GTK2\"\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   Показати форматовану назву треку до виводу\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1276,7 +1322,7 @@ msgstr ""
 "                      [l]тривалість, [n]номер треку, [y]рік, [c]коментар,\n"
 "                      [r]копірайт, [e]час що пройшов\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1285,28 +1331,24 @@ msgstr ""
 "                      наприклад: --nowplaying \"%%a - %%t\" повинно показати "
 "\"виконавець - назва\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      для більшої інформації дивитися http://sourceforge.net/"
-"apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Типово"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Так"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Ні"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1332,7 +1374,7 @@ msgstr ""
 "Гурт / Альбом Виконавець\n"
 "Користувацьке"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1340,7 +1382,7 @@ msgstr ""
 "Зліва\n"
 "Справа"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1350,7 +1392,7 @@ msgstr ""
 "Трек\n"
 "Альбом"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1358,7 +1400,7 @@ msgstr ""
 "В порядку зростання\n"
 "В порядку спадання"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1366,14 +1408,7 @@ msgstr ""
 "2.3 (Рекомендовано)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Не можу знайти файл pixmap: %s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1386,7 +1421,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1505,7 +1540,7 @@ msgstr "Якість передискретизації (0..2, більше-кр
 
 #: ../translation/extra.c:37
 msgid "8-bit output (default is 16)"
-msgstr ""
+msgstr "8-бітний вихід (типовим є 16)"
 
 #. Game_Music_Emu decoder plugin
 #: ../translation/extra.c:39
@@ -1671,7 +1706,7 @@ msgstr "Частота дискретизація цілі"
 
 #: ../translation/extra.c:94
 msgid "Quality / Algorithm"
-msgstr ""
+msgstr "Якість / Алгоритм"
 
 #: ../translation/extra.c:95
 msgid "Automatic Samplerate (overrides Target Samplerate)"
@@ -1680,7 +1715,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1695,37 +1730,42 @@ msgstr ""
 
 #: ../translation/extra.c:102
 msgid "Enable surround"
+msgstr "Увімкнути оточення"
+
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "Файл вже існує. Перезаписати?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "Попередження конвертора"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "Будь ласка, виберіть інший енкодер"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "Помилка конвертора"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "Конвертування..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "Вибрати теку..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "Не можна зберегти типові параметри енкодера"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1733,79 +1773,79 @@ msgstr ""
 "Перевірте типові права доступу теки, спробуйте вибрати іншу назву, або "
 "звільніть трохи дискового простору"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 "Типові параметри з тою самою назвою вже існують. Спробуйте вибрати іншу "
 "назву."
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "Помилка"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "Додати новий енкодер"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "Редагувати енкодер"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "Вилучити типові значення"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Ця дія вилучить вибрані типові значення. Ви впевнені?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "Енкодери"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "Додати додаток до ланцюжка DSP"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "Не можу зберегти типові значення DSP"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "Нові типові значення DSP"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "Редагувати типові значення DSP"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "Типові значення DSP"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "Тека виводу:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "Назва файла виводу:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1815,89 +1855,89 @@ msgstr ""
 "Розширення (наприклад .mp3) буде додано автоматично.\n"
 "Залишіть поле пустим для типових значень (%a - %t)."
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "Енкодер:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "Типові значення DSP"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "Кількість потоків:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "Формат зразка виводу:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "Зберегти формат джерела"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 біт ціле"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 біт ціле"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 біт ціле"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 біт ціле"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 біт плаваюче"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "Коли файл існує:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "Питати"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "Перезаписати"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "Редагувати типові значення енкодера"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "Енкодер без назви"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "Розширення файла виводу:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "Наприклад mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "Командна стрічка:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1907,7 +1947,7 @@ msgstr ""
 "Приклад: lame - %o\n"
 "%i для вхідного файлу, %o для вихідного файлу, - для потокових даних"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1917,66 +1957,72 @@ msgstr ""
 "<small>%o - назва вихідного файлу\n"
 "%i - назва тимчасового вхідного файлу</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "Метод:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "Трубка"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "Тимчасовий файл"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>Записувач мітки</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "Редактор типових значень DSP"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "Типові значення DSP без назви"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Додати"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Не можу знайти файл pixmap: %s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2002,29 +2048,29 @@ msgstr ""
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
-msgstr ""
+msgstr "Власні команди оболонки"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
-msgstr ""
+msgstr "Редагувати"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
-msgstr ""
+msgstr "Закрит"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
-msgstr ""
+msgstr "Редагувати команду"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
-msgstr ""
+msgstr "Команда:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2033,74 +2079,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
-msgstr ""
+msgstr "ID:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "Загальні (Головне меню)"
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2108,92 +2154,92 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
-msgstr ""
+msgstr "Додати команду"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
-msgstr ""
+msgstr "Вилучити"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr ""
+msgstr "Ця дія спричинить вилучення вибраної команди оболонки. Ви впевнені?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
-msgstr ""
+msgstr "Підтвердження вилучення"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
-msgstr ""
+msgstr "ID має бути унікальним та не пустим.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
-msgstr ""
+msgstr "Команда оболонки має бути не порожньою.\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
-msgstr ""
+msgstr "Невірні значення"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
-msgstr ""
+msgstr "Підтримувані аудіо-формати"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
-msgstr ""
+msgstr "Всі файли (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
-msgstr ""
+msgstr "Відкрити файл(и)..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
-msgstr ""
+msgstr "Додати файл(и) до списку програвання..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
-msgstr ""
+msgstr "Додати теку(-ки) до списку програвання..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
-msgstr ""
+msgstr "help.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
-msgstr ""
+msgstr "Видалити файли з диска"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
-msgstr ""
+msgstr "Завантажити список"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
-msgstr ""
+msgstr "Інші файли (*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
-msgstr ""
+msgstr "Зберегти список як"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr ""
+msgstr "Файли списків DeaDBeeF (*.dbpl)"
 
 #: ../plugins/gtkui/ctmapping.c:129
 msgid "Content-Type"
@@ -2216,104 +2262,113 @@ msgstr ""
 
 #: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
 msgid "Nothing is selected."
+msgstr "Нічого не обрано."
+
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
-msgstr ""
+msgstr "Замінити на..."
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
-msgstr ""
+msgstr "Вставити..."
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
-msgstr ""
+msgstr "Вирізати"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
-msgstr ""
+msgstr "Копіювати"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
-msgstr ""
+msgstr "Вставити"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
-msgstr ""
+msgstr "Заблокувати переміщення"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
-msgstr ""
+msgstr "Перемістити вкладку ліворуч"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
-msgstr ""
+msgstr "Перемістити вкладку праворуч"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
-msgstr ""
+msgstr "Вилучити вкладку"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
-msgstr ""
+msgstr "Перейменувати вкладку"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
-msgstr ""
+msgstr "Додати нову вкладку"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
-msgstr ""
+msgstr "Показати заголовки колонок"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
-msgstr ""
+msgstr "Розгорнути"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
-msgstr ""
+msgstr "Заповнити"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
+msgstr "Налаштувати кнопку"
+
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
 msgstr ""
 
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
-msgstr ""
+msgstr "Редагувати список"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
-msgstr ""
+msgstr "Перейменувати список"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
-msgstr ""
+msgstr "Вилучити список"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
-msgstr ""
+msgstr "Додати новий список"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
-msgstr ""
+msgstr "Назва"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 1bc950a..dcba92b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -3,18 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# ppanhh <vietnamesel10n at gmail.com>, 2013
-# Duy Hung Tran <nguyentieuhau at gmail.com>, 2010
-# ppanhh <vietnamesel10n at gmail.com>, 2013
-# ppanhh <vietnamesel10n at gmail.com>, 2013
-# Duy Hung Tran <nguyentieuhau at gmail.com>, 2010
+# Anh Phan <vietnamesel10n at gmail.com>, 2013
+# Anh Phan <vietnamesel10n at gmail.com>, 2013-2014
+# TRAN Duy Hung <nguyentieuhau at gmail.com>, 2010
+# Anh Phan <vietnamesel10n at gmail.com>, 2013
+# Anh Phan <vietnamesel10n at gmail.com>, 2013
+# TRAN Duy Hung <nguyentieuhau at gmail.com>, 2010
+# TRAN Duy Hung <nguyentieuhau at gmail.com>, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:49+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/deadbeef-"
 "player/language/vi/)\n"
 "Language: vi\n"
@@ -23,17 +25,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Về DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s Nhật ký thay đổi"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF Dịch giả"
@@ -90,788 +92,818 @@ msgstr "Preamp Về 0"
 msgid "Zero Bands"
 msgstr "Bands Về 0"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "Presets"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 ngày %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d ngày %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Dừng phát | %d bài | Tất cả %s"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "Tạm dừng | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d bài | Tất cả %s"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "Playlist Mới"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Playlist Mới (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "Danh sách phát dạng tab"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "Danh sách phát"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "Ngăn đôi (trên và dưới cùng)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "Ngăn đôi (trái và phải)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "Danh sách phát dạng tab"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "Thuộc tính lựa chọn"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "Hiển thị album nghệ thuật"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "Phạm vi"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "Phổ tần"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "Nút"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr "Thanh trượt"
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr "Điều khiển phát lại"
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr "Thanh âm lượng"
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr "Giọng điện tử"
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "Lỗi trong khi đọc tập tin trợ giúp"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "Không thể đọc tập tin trợ giúp"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
+"Chương trình hiện đang chạy ở chế độ nền. Nếu bạn thoát bây giờ, thì tác vụ "
+"này sẽ bị hủy bỏ hoặc gián đoạn. Điều này có thể dẫn tới việc mất mát dữ "
+"liệu."
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "Bạn vẫn muốn thoát?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "_Tập tin"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "_Mở tập tin"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "Thêm tập tin"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "Thêm thư mục"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "Thêm vị trí"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "Tạo playlist mới"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "Nạp playlist"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "Lưu playlist"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "T_hoát"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "_Sửa"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "_Xóa"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "Chọn tất cả"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "Bỏ chọn tất cả"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "Đảo lựa chọn"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "Lựa chọn"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Xóa"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "Cắt"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "Tì_m"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "Sắp xếp theo"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Tiêu đề"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "Thứ tự bài"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "Nghệ sĩ"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "Ngày"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "Ngẫu nhiên"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "Tùy chọn"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "Tùy chỉnh"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "_Hiển thị"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "Thanh trạng thái"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "Chế độ thiết kế"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "Phát _lại"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "Thứ tự"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "Theo thứ tự"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "Bài hát ngẫu nhiên"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "Album ngẫu nhiên"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "Lặp lại"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "Lặp lại tất cả"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "Lặp lại chỉ một đối tượng"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "Không lặp lại"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "Trượt theo quá trình phát lại"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "Con trỏ đi theo quá trình phát lại"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "Dừng sau khi kết thúc bài hiện tại"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr "Dừng lại sau bài này"
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr "Dừng lại sau album này"
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "Nhảy đến bài hiện tại"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "T_rợ giúp"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_Nhật ký thay đổi"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "Thôn_g tin"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "_Dịch giả"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "Dừng"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "Phát"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "Tạm dừng"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "Trước"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "Sau"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "Phát Ngẫu Nhiên"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "Thông tin"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "Thoát"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "Thông Tin Bài Nhạc"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "Địa điểm:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "Thiết lập"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "Á_p dụng"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "Đó_ng"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "Tiêu đề:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "Nhập tiêu đề cột mới tại đây"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "Loại:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "Item Index"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "Đang phát"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "Bìa Album"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "Nghệ sĩ - Album"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "Thời lượng"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "Thứ Tự Bài Hát"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "Nhóm / Nghệ sĩ"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "Định dạng:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "Canh chỉnh:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "Trái"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "Phải"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "_Hủy"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "Đồng _ý"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "Plugin đầu ra:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "Thiết bị đầu ra:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Luôn luôn chuyển đổi âm thanh 8 bit sang 16 bit"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
-msgstr ""
+msgstr "Luôn chuyển đổi audio dạng 16 bit sang 24 bit"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "Âm thanh"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "Chế độ Replaygain:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "Tắt"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "Bài"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "Tỉ lệ cao điểm Replaygain"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "Khuếch đại trước của Replaygain:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "Khuếch đại trước toàn cục:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "Thêm tập tin từ dòng lệnh (hay bộ quản lý tập tin) vào playlist này:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "Phục hội lại phiên làm việc cuối khi vừa khởi động"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "Không thêm từ các tập tin lưu trữ khi thêm thư mục"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "Tự động-cài đặt lại \"Dừng lại sau đối tượng hiện tại\""
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "Phát lạ_i"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "Cấu hình"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP Chain Preset"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "_Nạp"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "Thu nhỏ xuống khay hệ thống"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "Ẩn biểu tượng khay hệ thống"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Ẩn đối tượng \"Xóa khỏi ổ đĩa\" từ menu ngữ cảnh"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "Ghi đè"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "Mặt trước"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "Mặt sau"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "Màu thanh trượt/thanh âm lượng"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "Giữa"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "Sáng"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "Tối"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "Văn bản"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "Dòng chẵn"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "Dòng lẻ"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "Dòng đã chọn"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "Văn bản đã chọn"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "Trỏ chuột"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "Màu playlist"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -879,122 +911,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1002,91 +1040,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "Nghệ sĩ / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "Bài Số"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "Xóa khỏi đĩa"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "Thêm cột"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "Sửa cột"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "Xóa cột"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "Nhóm bởi"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "Không"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "Nghệ sĩ/Ngày/Album"
 
@@ -1103,11 +1150,11 @@ msgstr ""
 msgid "Default Audio Device"
 msgstr "Thiết bị Âm thanh Mặc định"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1115,7 +1162,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "Thêm tập tin..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "Đang khởi tạo..."
 
@@ -1128,139 +1175,139 @@ msgid "Really close the window?"
 msgstr "Bạn thật sự muốn đóng cửa sổ này?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "Phím tắt"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "Giá trị"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr ""
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr ""
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr ""
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr ""
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr ""
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr ""
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr ""
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr ""
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr ""
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr ""
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr ""
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr ""
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr ""
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1268,33 +1315,31 @@ msgid ""
 "                      copy[r]ight, [e]lapsed\n"
 msgstr ""
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr ""
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "Mặc định"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "Có"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "Không"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1309,7 +1354,7 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1317,7 +1362,7 @@ msgstr ""
 "Trái\n"
 "Phải"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1327,26 +1372,19 @@ msgstr ""
 "Bài\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
 msgstr ""
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1356,7 +1394,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1649,7 +1687,7 @@ msgstr ""
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
@@ -1666,111 +1704,116 @@ msgstr ""
 msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr ""
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1778,89 +1821,89 @@ msgid ""
 "Leave the field empty for default (%a - %t)."
 msgstr ""
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr ""
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr ""
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr ""
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1868,7 +1911,7 @@ msgid ""
 "%i for input file, %o for output file, - for stdin"
 msgstr ""
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1876,66 +1919,72 @@ msgid ""
 "%i - temporary input file name</small>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr ""
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr ""
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr ""
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr ""
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr ""
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "Thêm"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1963,27 +2012,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -1992,74 +2041,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2067,90 +2116,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2177,102 +2226,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index baa5952..f4caf41 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Wylmer Wang <wantinghard at gmail.com>, 2013
+# Wylmer Wang <wantinghard at gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/deadbeef-"
 "player/language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "关于 DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s 更新记录"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF 翻译者"
@@ -86,913 +86,949 @@ msgstr "清零前置放大"
 msgid "Zero Bands"
 msgstr "清零频段"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "预设置"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 天 %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d 天 %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "已停止 | 音轨数 %d | 播放总时长 %s"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "单声道"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "立体声"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "已暂停 | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | 音轨数 %d | 播放总时长 %s"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "新播放列表"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "新播放列表(%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "标签页式播放列表"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "播放列表"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "分割线(顶部和底部)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "分割线(左侧和右侧)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "播放列表标签页"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "所选项目属性"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "专辑封面显示"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "范围"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "频谱"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
 msgstr "水平框"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
 msgstr "垂直框"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "按钮"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr "定位条"
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr "播放控制"
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr "音量条"
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr "芯片合成语音"
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "读取帮助文件时出错"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "加入帮助文件失败"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 "播放器正在执行后台任务。如果您现在退出,任务会取消或中断;这可能造成数据损"
 "失。"
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "您依然要退出吗?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "警告"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "打开文件(_O)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "添加文件"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "添加文件夹"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "添加位置"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "新播放列表"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "加载播放列表"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "保存播放列表"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "选择所有"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "去选所有"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "反转选择"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "选择"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "移除"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "剪切"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "查找(_F)"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "排序依据"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "标题"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "音轨号"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "专辑"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "艺人"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "日期"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "随机"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "自定义"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "偏好设置"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "状态栏"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "均衡器"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
 msgstr "设计模式"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "播放(_P)"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "顺序"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "线性"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "打乱音轨"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "打乱专辑"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "循环"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "全部循环"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "单曲循环"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "不循环"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "随播放滚动列表"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "光标定位在播放的曲目"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "当前曲目后停止"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr "当前专辑后停止"
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "跳到当前音轨"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "更新记录(_C)"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "翻译者(_T)"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "搜索"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "停止"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "播放"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "暂停"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "上一曲"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "下一曲"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "随机播放"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "关于"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "退出"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "帮助"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "音轨属性"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "位置:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "设置"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "应用(_A)"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "元数据"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "属性"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "标题:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "在此输入新的列标题"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "类型:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "项目索引"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "正在播放"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "专辑封面"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "艺人 - 专辑"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "时长"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "音轨号"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "乐队 / 专辑艺人"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "格式:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "对齐:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "左"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "右"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "输出插件:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "输出设备:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "总是将 8 位音频转换为 16 位"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "总是将 16 位音频转换为 24 位"
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "声音"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "回放增益方式:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "禁用"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "音轨"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "回放增益峰值均衡"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "回放预增益:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "全局预增益:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "通过命令行(或文件管理器)向此播放列表添加文件:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "启动时恢复上一次会话"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "在添加文件夹时排除归档"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "自动复位“当前曲目后停止”"
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "回放"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "配置"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP 链预设置"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "加载(_L)"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP(数字信号处理)"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "点击关闭时最小化到托盘"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "隐藏系统托盘图标"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "启用日文 SHIFT-JIS 编码检测和重新编码"
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "启用俄语 CP1251 字符集检测和重新编码"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "启用中文 Chinese CP936 编码检测和重新编码"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "界面刷新频率(每秒的次数):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "播放时的标题栏文本:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "停止时的标题栏文本:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "图形用户界面插件(更改后需重启程序):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
-msgstr ""
+msgstr "播放器"
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "用鼠标中键关闭播放列表"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
-msgstr ""
+msgstr "用粗体显示正在播放的音轨"
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "隐藏“从磁盘删除”右键菜单项"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr "隐藏“从磁盘移除”右键菜单项"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "在添加单个文件夹时自动命名播放列表"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "自动调整列宽以适应窗口"
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "用户界面/杂项"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "覆盖"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "前景色"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "背景色"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "搜索条/音量条颜色"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "中"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "右"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "暗"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "基础"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "文本"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "标签条颜色"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "覆盖(不同于 GTK 树状视图风格,但渲染更快)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "偶数行"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "奇数行"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "选择的行"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "选择的文本"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "光标"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "播放列表颜色"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "颜色"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "启用代理服务器"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "代理服务器地址:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "代理服务器端口:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "代理类型:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "代理用户名:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "代理密码:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "HTTP 用户代理:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr "编辑 内容-类型 映射"
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "网络"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr "已分配的快捷键:"
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr "操作:"
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
 msgstr "<未设置>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr "按键组合:"
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
 msgstr "全局快捷键"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
 msgstr ""
+"使用“应用”按钮保存您的更改,\n"
+"或使用“恢复”按钮撤消更改。\n"
+"在您按“应用”之前,更改不会保存。"
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
-msgstr ""
+msgstr "默认(_D)"
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
 msgstr "快捷键"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "版本:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "版权"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "插件"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
+msgstr "自定义标题"
+
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
 msgid "Group By ..."
 msgstr "分组依据..."
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
 msgstr "排序依据..."
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "格式"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "升序"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "降序"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "选择 DSP 插件"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "插件"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "标签编辑器设置"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "写 ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "写 ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "写 APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "清除 ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "清除 ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "清除 APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 版本"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (推荐)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 字符编码(默认为 iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "写 ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
 msgstr "内容-类型 映射"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1003,91 +1039,103 @@ msgstr ""
 "文件的内容类型会是“audio/x-mpeg”,它需要通过 DeaDBeeF 自己的“stdmpg”插件"
 "或“ffmpeg”插件解码。"
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr "复位为默认值"
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr "内容-类型:"
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr "插件:"
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr "按钮属性"
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr "颜色:"
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr "文本颜色:"
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr "图标:"
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr "标签:"
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr "选择操作"
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+"这一对话框可以自定义任何音轨的标题。这对电台最有用。“添加位置”对话框也有一个"
+"选项来设置自定义标题。标题将出现在显示“艺人”元数据的列中。它会显示为“[自定"
+"义] 艺人”(如果有“艺人”字段),或“自定义”。"
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "艺人 / 专辑"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "音轨号"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "添加到播放列表"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr "添加到播放队列"
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
 msgstr "从播放队列中移除"
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
 msgstr "重新载入元数据"
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "从磁盘中删除"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr "从磁盘中移除"
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "添加列"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "编辑列"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "移除列"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
-msgstr ""
+msgstr "滚动时固顶组"
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "分组依据"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "无"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "艺人/日期/专辑"
 
@@ -1104,19 +1152,19 @@ msgstr "配置 %s"
 msgid "Default Audio Device"
 msgstr "默认音频设备"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr ""
+msgstr "您修改了热键设置,但没有保存更改。"
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
-msgstr ""
+msgstr "您确定要继续而不保存吗?"
 
 #: ../plugins/gtkui/progress.c:56
 msgid "Adding files..."
 msgstr "正在添加文件..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "正在初始化..."
 
@@ -1129,139 +1177,139 @@ msgid "Really close the window?"
 msgstr "真的关闭该窗口吗?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[多个值] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "键"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "值"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
 msgstr "[多个值] "
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "正在写入标签..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
 msgstr "字段名"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "名称:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "字段名称不能以 : 或 _ 开头"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "无法添加字段"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "同名的字段已经存在,请尝试其他名称。"
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "添加字段"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "移除字段"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
 msgstr "用法:deadbeef [选项] [--] [文件]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "选项:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  或  -h     打印帮助(这条消息)并退出\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             退出播放器\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          打印版本信息并退出\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             开始播放\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             停止播放\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            暂停播放\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     切换暂停状态\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr "   --play-pause       若停止则开始播放,否则切换暂停状态\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             播放列表中的下一首歌曲\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             播放列表中的上一首歌曲\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           播放列表中的任一首歌曲\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            向现有的播放列表中追加文件\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr "   --gui PLUGIN       指定要使用的用户界面插件,默认为“GTK2”\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   向标准输出打印格式化的音轨名称\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1272,7 +1320,7 @@ msgstr ""
 "                      [l]时长, [n]音轨号, [y]年代, [c]注释,\n"
 "                      [r]版权, [e]已播放时间\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1280,28 +1328,24 @@ msgid ""
 msgstr ""
 "                      例:--nowplaying \"%%a - %%t\" 将打印“艺人 - 标题”\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      更多信息请参阅 http://sourceforge.net/apps/mediawiki/"
-"deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "默认"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "是"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "否"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1327,7 +1371,7 @@ msgstr ""
 "乐队 / 专辑艺人\n"
 "自定义"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1335,7 +1379,7 @@ msgstr ""
 "左\n"
 "右"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1345,7 +1389,7 @@ msgstr ""
 "音轨\n"
 "专辑"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1353,7 +1397,7 @@ msgstr ""
 "升序\n"
 "降序"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1361,14 +1405,7 @@ msgstr ""
 "2.3 (推荐)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "找不到位图文件:%s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1380,8 +1417,8 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
-msgstr "添加音频 CD"
+msgid "Add Audio CD"
+msgstr ""
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1673,8 +1710,8 @@ msgstr "自动采样率(替代目标采样率)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
-msgstr "配置自定义的 shell 命令"
+msgid "Configure Custom Shell Commands"
+msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
@@ -1690,111 +1727,116 @@ msgstr "优先使用 Ken 模拟器而非 Satoh (环绕效果将无法使用)"
 msgid "Enable surround"
 msgstr "启用环绕效果"
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
+msgstr "[内建] %s"
+
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "文件已存在。覆盖吗?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "转换器警告"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "请选择编码器"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "转换器错误"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "正在转换..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "选择文件夹..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "保存编码器预设置失败"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr "请检查预设置文件夹权限,选择其他标题或清理出一些磁盘空间"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "同名的预设置已经存在。请另选一个标题。"
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "错误"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "添加新编码器"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "编辑编码器"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "移除预设置"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "此操作将删除所选的预设置。您确定吗?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "编码器"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "向 DSP 链上添加插件"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "保存 DSP 预设置失败"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "新建 DSP 预设置"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "编辑 DSP 预设置"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP 预设置"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "输出文件夹:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
 msgstr "写入源音轨文件夹"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
 msgstr "保持文件夹结构"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "输出文件名:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1804,89 +1846,89 @@ msgstr ""
 "扩展名(如 .mp3)会自动追加。\n"
 "不填则使用默认(%a - %t)。"
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "编码器:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP 预设置:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "线程数:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "输出采样格式:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "保持源格式"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 位有符号整型"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 位有符号整型"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 位有符号整型"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 位有符号整型"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 位浮点型"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "若文件存在:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "提示"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "编辑编码器预设置"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "无标题编码器"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "输出文件扩展名:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "如 mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "命令行:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1896,7 +1938,7 @@ msgstr ""
 "例如:lame - %o\n"
 "%i 为输入文件,%o 为输出文件,- 为标准输入"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1906,66 +1948,72 @@ msgstr ""
 "<small>%o - 输出文件名\n"
 "%i - 临时输入文件名</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "方法:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "管道"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "临时文件"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>标签编辑器</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "DSP 预设置编辑器"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "无标题的 DSP 预设置"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "添加"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "找不到位图文件:%s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -2003,27 +2051,27 @@ msgstr ""
 msgid "Custom Shell Commands"
 msgstr "自定义 shell 命令"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
 msgstr "编辑"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
 msgstr "关闭"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
 msgstr "编辑命令"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
 msgstr "命令:"
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2034,147 +2082,149 @@ msgstr ""
 "任意 shell 命令。命令将在主应用程序启动的 shell 环境中执行。可以使用标题格式"
 "化代码。例如:xdg-open %D"
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
 msgstr "标识:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr "一个名字,形式不限,如“我的 shell 命令”"
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr "命令标识,通常应简短,如“youtube_open”。此标识应唯一。"
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr "单条音轨"
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr "作用于单条音轨。"
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr "多条音轨。"
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr "作用于多条音轨。"
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr "本地"
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr "作用于本地文件。"
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr "远程"
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr "作用于远程文件(如 http:// 流)"
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "常规(主菜单)"
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr "项目应显示在主菜单中"
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version.</small>"
 msgstr ""
+"<small>如果您想向主菜单添加命令,请确保标题中包含“File/My Command”这样的菜单"
+"路径,例子中 File 是英文的菜单名。</small>"
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "添加命令"
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr "删除"
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "此操作将删除所选的 shell 命令。您确定吗?"
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr "确认移除"
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr "标识不能为空,且必须唯一。\n"
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr "标题不能为空。\n"
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr "shell 命令不能为空。\n"
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "无效的值"
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr "支持的声音格式"
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr "所有文件;(*)"
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr "打开文件;..."
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr "向播放列表添加文件;..."
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr "向播放列表添加文件夹;..."
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr "跟随符号链接"
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr "帮助.txt"
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr "从磁盘中删除文件"
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -2182,19 +2232,19 @@ msgstr ""
 "文件将消失。继续吗?\n"
 "(可以在 GTKUI 插件设置中关掉这个对话框)"
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr "加载播放列表"
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr "其他文件;(*)"
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr "播放列表另存为"
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF 播放列表文件(*.dbpl)"
 
@@ -2227,102 +2277,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr "没有选择项目。"
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "“%s”部件不可用"
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr "替换为..."
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr "插入..."
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr "剪切"
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr "复制"
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr "粘贴"
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
-msgstr ""
+msgstr "不支持此类部件的多个实例"
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr "锁定移动"
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr "标签左移"
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr "标签右移"
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr "移除标签"
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr "重命名标签"
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr "添加新标签"
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr "显示列标题"
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr "向框中增加 1 项"
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr "从框中减少 1 项"
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr "平均"
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr "扩展"
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr "填充"
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr "配置按钮"
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr "语音:"
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
-msgstr ""
+msgstr "编辑播放列表"
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
-msgstr ""
+msgstr "重命名播放列表"
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
-msgstr ""
+msgstr "移除播放列表"
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
-msgstr ""
+msgstr "添加新播放列表"
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
-msgstr ""
+msgstr "播放列表浏览器"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 09e1314..60d3bf3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# brli7848 <rainman59118 at gmail.com>, 2013
-# brli7848 <rainman59118 at gmail.com>, 2013
+# BrLi <rainman59118 at gmail.com>, 2013
+# BrLi <rainman59118 at gmail.com>, 2013
 # PCMan <pcman.tw at gmail.com>, 2010
 # PCMan <pcman.tw at gmail.com>, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-24 19:10+0100\n"
-"PO-Revision-Date: 2013-11-20 09:50+0000\n"
-"Last-Translator: waker <wakeroid at gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 19:54+0200\n"
+"PO-Revision-Date: 2014-07-31 18:10+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
 "deadbeef-player/language/zh_TW/)\n"
 "Language: zh_TW\n"
@@ -22,17 +22,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../plugins/gtkui/callbacks.c:338
+#: ../plugins/gtkui/callbacks.c:353
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "關於 DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:351
+#: ../plugins/gtkui/callbacks.c:366
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s ChangeLog"
 
-#: ../plugins/gtkui/callbacks.c:675
+#: ../plugins/gtkui/callbacks.c:626
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF 翻譯者"
@@ -89,789 +89,816 @@ msgstr "前級放大器歸零"
 msgid "Zero Bands"
 msgstr "頻帶歸零"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
 #: ../plugins/converter/converter.glade.h:50
 msgid "Presets"
 msgstr "預設值"
 
-#: ../plugins/gtkui/gtkui.c:163
+#: ../plugins/gtkui/gtkui.c:167
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 天 %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:166
+#: ../plugins/gtkui/gtkui.c:170
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d 天 %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:175
+#: ../plugins/gtkui/gtkui.c:179
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "停止 | 第 %d 軌 | 總播放時間:%s"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Mono"
 msgstr "單聲道"
 
-#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
 msgid "Stereo"
 msgstr "立體聲"
 
-#: ../plugins/gtkui/gtkui.c:213
+#: ../plugins/gtkui/gtkui.c:215
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:219
+#: ../plugins/gtkui/gtkui.c:221
 msgid "Paused | "
 msgstr "暫停 | "
 
-#: ../plugins/gtkui/gtkui.c:224
+#: ../plugins/gtkui/gtkui.c:226
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d 位元 | %s | %d:%02d / %s | 第 %d 首 | 總播放時間:%s"
 
-#: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
 msgid "New Playlist"
 msgstr "新增播放清單"
 
-#: ../plugins/gtkui/gtkui.c:709
+#: ../plugins/gtkui/gtkui.c:699
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "新增播放清單 (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:956
 msgid "Playlist with tabs"
 msgstr "含分頁的播放清單"
 
-#: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Playlist"
 msgstr "播放清單"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:960
 msgid "Splitter (top and bottom)"
 msgstr "分隔線 (上與下)"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:961
 msgid "Splitter (left and right)"
 msgstr "分隔線 (左與右)"
 
 #. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:964
 msgid "Playlist tabs"
 msgstr "播放清單分頁"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:965
 msgid "Selection properties"
 msgstr "選取屬性"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:966
 msgid "Album art display"
 msgstr "顯示專輯封面"
 
-#: ../plugins/gtkui/gtkui.c:976
+#: ../plugins/gtkui/gtkui.c:967
 msgid "Scope"
 msgstr "範圍"
 
-#: ../plugins/gtkui/gtkui.c:977
+#: ../plugins/gtkui/gtkui.c:968
 msgid "Spectrum"
 msgstr "頻譜"
 
-#: ../plugins/gtkui/gtkui.c:978
+#: ../plugins/gtkui/gtkui.c:969
 msgid "HBox"
-msgstr ""
+msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:979
+#: ../plugins/gtkui/gtkui.c:970
 msgid "VBox"
-msgstr ""
+msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
+#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
 msgid "Button"
 msgstr "按鈕"
 
-#: ../plugins/gtkui/gtkui.c:1166
+#: ../plugins/gtkui/gtkui.c:972
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:973
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:974
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:975
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1150
 msgid "Failed while reading help file"
 msgstr "未能讀取說明檔案"
 
-#: ../plugins/gtkui/gtkui.c:1176
+#: ../plugins/gtkui/gtkui.c:1160
 msgid "Failed to load help file"
 msgstr "未能載入說明檔案"
 
-#: ../plugins/gtkui/gtkui.c:1187
+#: ../plugins/gtkui/gtkui.c:1171
 msgid ""
-"The player is currently running backgroud tasks. If you quit now, the tasks "
+"The player is currently running background tasks. If you quit now, the tasks "
 "will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1189
+#: ../plugins/gtkui/gtkui.c:1173
 msgid "Do you still want to quit?"
 msgstr "仍然要退出?"
 
-#: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
-#: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
 msgid "Warning"
 msgstr "警告"
 
-#: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
 msgid "_Open file(s)"
 msgstr "開啟檔案(_O)"
 
-#: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
 msgid "Add file(s)"
 msgstr "加入檔案"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
 msgid "Add folder(s)"
 msgstr "加入資料夾"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
 #: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "Add location"
 msgstr "加入位址"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "New playlist"
 msgstr "新播放清單"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Load playlist"
 msgstr "載入播放清單"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Save playlist"
 msgstr "儲存播放清單"
 
-#: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
 msgid "_Quit"
 msgstr "結束(_Q)"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Select all"
 msgstr "全選"
 
-#: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
 msgid "Deselect all"
 msgstr "全部取消選取"
 
-#: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
 msgid "Invert selection"
 msgstr "反向選取"
 
-#: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
 msgid "Selection"
 msgstr "選取"
 
-#: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:65
+#: ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "移除"
 
-#: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Crop"
 msgstr "剪裁"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "_Find"
 msgstr "尋找(_F)"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Sort by"
 msgstr "排序依據"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
-#: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
-#: ../plugins/converter/interface.c:605
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+#: ../plugins/converter/interface.c:606
 #: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:322
+#: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "歌名"
 
-#: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Track number"
 msgstr "曲號"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
 #: ../translation/extra.c:73
 msgid "Album"
 msgstr "專輯"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:69
 msgid "Artist"
 msgstr "藝人"
 
-#: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
 #: ../translation/extra.c:74
 msgid "Date"
 msgstr "日期"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
 #: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Random"
 msgstr "隨機"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
-#: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Custom"
 msgstr "自訂"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
 #: ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "Status bar"
 msgstr "狀態列"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Equalizer"
 msgstr "等化器"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
 msgid "Design mode"
-msgstr ""
+msgstr "設計模式"
 
-#: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "_Playback"
 msgstr "播放(_P)"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
 #: ../plugins/gtkui/deadbeef.glade.h:33
 msgid "Order"
 msgstr "順序"
 
-#: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
 msgid "Linear"
 msgstr "線性"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
 msgid "Shuffle tracks"
 msgstr "調亂歌曲"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Shuffle albums"
 msgstr "調亂專輯"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Looping"
 msgstr "重複"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Loop all"
 msgstr "重複全部"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Loop single song"
 msgstr "重複單一曲目"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Don't loop"
 msgstr "不要重複播放"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Scroll follows playback"
 msgstr "隨播放捲動"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Cursor follows playback"
 msgstr "隨播放移動游標"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current"
-msgstr "播放當前歌曲後停止"
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "Jump to current track"
 msgstr "跳至當前歌曲"
 
-#: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
-#: ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+#: ../plugins/gtkui/deadbeef.glade.h:46
 msgid "_Help"
 msgstr "說明(_H)"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
 msgid "_ChangeLog"
 msgstr "_ChangeLog"
 
-#: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "_Translators"
 msgstr "翻譯者(_T)"
 
-#: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "Search"
 msgstr "搜尋"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "Stop"
 msgstr "停止"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Play"
 msgstr "播放"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Pause"
 msgstr "暫停"
 
-#: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
 msgid "Previous"
 msgstr "上一首"
 
-#: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
 msgid "Next"
 msgstr "下一首"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
 msgid "Play Random"
 msgstr "隨機播放"
 
-#: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
 msgid "About"
 msgstr "關於"
 
-#: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
 msgid "Quit"
 msgstr "結束"
 
-#: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
-#: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
-#: ../plugins/gtkui/actionhandlers.c:430
+#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+#: ../plugins/gtkui/actionhandlers.c:476
 msgid "Help"
 msgstr "說明"
 
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+#: ../plugins/gtkui/deadbeef.glade.h:62
 msgid "Track Properties"
 msgstr "歌曲屬性"
 
-#: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
 msgid "Location:"
 msgstr "位址:"
 
-#: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
 msgid "Settings"
 msgstr "設定"
 
-#: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
 msgid "_Apply"
 msgstr "套用(_A)"
 
-#: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+#: ../plugins/gtkui/deadbeef.glade.h:66
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Metadata"
 msgstr "元數據"
 
-#: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
 msgid "Properties"
 msgstr "屬性"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
-#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
 #: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:159
+#: ../plugins/shellexecui/interface.c:163
 #: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
 msgid "Title:"
 msgstr "歌名:"
 
-#: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Enter new column title here"
 msgstr "在此輸入欄位名稱"
 
-#: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Type:"
 msgstr "類型:"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1343
 msgid "Item Index"
 msgstr "項目索引"
 
-#. create default set of columns
-#: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+#: ../plugins/gtkui/interface.c:1344
 msgid "Playing"
 msgstr "正在播放"
 
-#: ../plugins/gtkui/interface.c:1459
+#: ../plugins/gtkui/interface.c:1345
 msgid "Album Art"
 msgstr "專輯封面"
 
-#: ../plugins/gtkui/interface.c:1460
+#: ../plugins/gtkui/interface.c:1346
 msgid "Artist - Album"
 msgstr "藝人 - 專輯"
 
-#: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
-#: ../plugins/gtkui/search.c:425
+#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+#: ../plugins/gtkui/search.c:422
 msgid "Duration"
 msgstr "長度"
 
-#: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
 msgid "Track Number"
 msgstr "歌曲編號"
 
-#: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
 msgid "Band / Album Artist"
 msgstr "樂隊 / 專輯藝人"
 
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Format:"
 msgstr "格式:"
 
-#: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Alignment:"
 msgstr "對齊:"
 
-#: ../plugins/gtkui/interface.c:1506
+#: ../plugins/gtkui/interface.c:1392
 msgid "Left"
 msgstr "左"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1393
 msgid "Right"
 msgstr "右"
 
-#: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
-#: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+#: ../plugins/gtkui/deadbeef.glade.h:69
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
-#: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Output plugin:"
 msgstr "輸出外掛程式:"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Output device:"
 msgstr "輸出裝置:"
 
-#: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "將 8 位元音訊轉為 16 位元"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
 msgid "Sound"
 msgstr "聲音"
 
-#: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Replaygain mode:"
 msgstr "播放增益模式:"
 
-#: ../plugins/gtkui/interface.c:1869
+#: ../plugins/gtkui/interface.c:1757
 msgid "Disable"
 msgstr "停用"
 
-#: ../plugins/gtkui/interface.c:1870
+#: ../plugins/gtkui/interface.c:1758
 msgid "Track"
 msgstr "歌曲"
 
-#: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Replaygain peak scale"
 msgstr "播放增益峰值比例"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Replaygain preamp:"
 msgstr "播放增益前置放大器:"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Global preamp:"
 msgstr "全域前置放大器:"
 
-#: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "由指令列 (或檔案管理員) 將檔案加入至此播放清單:"
 
-#: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Resume previous session on startup"
 msgstr "啟動時繼續前一作業"
 
-#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Don't add from archives when adding folders"
 msgstr "加入資料夾時不要加入壓縮檔"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Auto-reset \"Stop after current\""
-msgstr "自動重設「播放當前歌曲後停止」"
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Playback"
 msgstr "播放"
 
-#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
-#: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
 #: ../plugins/converter/converter.glade.h:47
 msgid "Configure"
 msgstr "設定"
 
-#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "DSP Chain Preset"
 msgstr "DSP 連鎖預設值"
 
-#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "_Load"
 msgstr "載入(_L)"
 
-#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Close minimizes to tray"
 msgstr "關閉時縮小至系統匣"
 
-#: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Hide system tray icon"
 msgstr "隱藏系統匣圖示"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Enable Russian CP1251 detection and recoding"
 msgstr "啟用俄羅斯文 CP1251 偵測與重新編碼"
 
-#: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "啟用中文 CP936 偵測與重新編碼"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Interface refresh rate (times per second):"
 msgstr "介面重刷率 (每秒次數):"
 
-#: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Titlebar text while playing:"
 msgstr "播放時標題列文字:"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Titlebar text while stopped:"
 msgstr "停止時標題列文字:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "GUI Plugin (changing requires restart):"
 msgstr "圖像用戶介面外掛程式 (重新啟動始生效):"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Draw playing track using bold font"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Hide \"Delete from disk\" context menu item"
-msgstr "隱藏「自磁碟刪除」境況選單項目"
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Hide \"Remove From Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Auto-name playlists when adding a single folder"
 msgstr "加入單一資料夾時自動為播放清單命名"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
 msgid "GUI/Misc"
 msgstr "圖形介面/雜項"
 
-#: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Override"
 msgstr "優先於"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Foreground"
 msgstr "前景"
 
-#: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Background"
 msgstr "背景"
 
-#: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Seekbar/Volumebar colors"
 msgstr "搜索列/音量列 色彩"
 
-#: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Middle"
 msgstr "中等"
 
-#: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
 msgid "Light"
 msgstr "光亮"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Dark"
 msgstr "暗淡"
 
-#: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Base"
 msgstr "基礎"
 
-#: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Text"
 msgstr "文字"
 
-#: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Tab strip colors"
 msgstr "分頁條色彩"
 
-#: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "優先於 (放鬆 GTK 樹狀目錄佈景主題,但會加速成像)"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Even row"
 msgstr "偶數列"
 
-#: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Odd row"
 msgstr "單數列"
 
-#: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Selected row"
 msgstr "所選列"
 
-#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Selected text"
 msgstr "所選文字"
 
-#: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Cursor"
 msgstr "游標"
 
-#: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Playlist colors"
 msgstr "播放清單色彩"
 
-#: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Colors"
 msgstr "色彩"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Enable Proxy Server"
 msgstr "啟用代理伺服器"
 
-#: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "Proxy Server Address:"
 msgstr "代理伺服器位址:"
 
-#: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "Proxy Server Port:"
 msgstr "代理伺服器連接埠:"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "Proxy Type:"
 msgstr "代理類型:"
 
-#: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "Proxy Username:"
 msgstr "代理使用者名稱:"
 
-#: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "Proxy Password:"
 msgstr "代理密碼:"
 
-#: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "HTTP User Agent:"
 msgstr "HTTP 使用者代理:"
 
-#: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "Network"
 msgstr "網路"
 
-#: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
-#: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "<Not set>"
-msgstr ""
+msgstr "<Not set>"
 
-#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "Global hotkey"
-msgstr ""
+msgstr "全域快速鍵"
 
-#: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -879,122 +906,128 @@ msgid ""
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "Hotkeys"
-msgstr ""
+msgstr "快速鍵"
 
-#: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
 msgid "Version: "
 msgstr "版本:"
 
-#: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
 #: ../translation/extra.c:82
 msgid "Copyright"
 msgstr "版權"
 
-#: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
 #: ../plugins/gtkui/ctmapping.c:131
 msgid "Plugins"
 msgstr "外掛程式"
 
-#: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
 msgid "URL:"
 msgstr "網址:"
 
-#: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
-msgid "Group By ..."
+#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+#: ../plugins/gtkui/deadbeef.glade.h:172
+msgid "Set Custom Title"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+msgid "Group By ..."
+msgstr "依據...分組"
+
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
 msgid "Sort by ..."
-msgstr ""
+msgstr "依據...排序"
 
-#: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
 msgid "Format"
 msgstr "格式"
 
-#: ../plugins/gtkui/interface.c:3574
+#: ../plugins/gtkui/interface.c:3502
 msgid "Ascending"
 msgstr "順序"
 
-#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/interface.c:3503
 msgid "Descending"
 msgstr "逆序"
 
-#: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
-#: ../plugins/converter/interface.c:733
+#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/converter/interface.c:734
 #: ../plugins/converter/converter.glade.h:48
 msgid "Select DSP Plugin"
 msgstr "選取 DSP 外掛程式"
 
-#: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
-#: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
 #: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
 msgid "Plugin"
 msgstr "外掛程式"
 
-#: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
 msgid "Tag Writer Settings"
 msgstr "標記寫入器設定"
 
-#: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
 msgid "Write ID3v2"
 msgstr "寫入 ID3v2"
 
-#: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
-#: ../plugins/gtkui/deadbeef.glade.h:178
+#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+#: ../plugins/gtkui/deadbeef.glade.h:182
 msgid "Write ID3v1"
 msgstr "寫入 ID3v1"
 
-#: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
-#: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
 msgid "Write APEv2"
 msgstr "寫入 APEv2"
 
-#: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
-#: ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+#: ../plugins/gtkui/deadbeef.glade.h:184
 msgid "Strip ID3v2"
 msgstr "砍掉 ID3v2"
 
-#: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
-#: ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+#: ../plugins/gtkui/deadbeef.glade.h:185
 msgid "Strip ID3v1"
 msgstr "砍掉 ID3v1"
 
-#: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
-#: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
 msgid "Strip APEv2"
 msgstr "砍掉 APEv2"
 
-#: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
 msgid "ID3v2 version"
 msgstr "ID3v2 版本"
 
-#: ../plugins/gtkui/interface.c:3799
+#: ../plugins/gtkui/interface.c:3727
 msgid "2.3 (Recommended)"
 msgstr "2.3 (建議版本)"
 
-#: ../plugins/gtkui/interface.c:3800
+#: ../plugins/gtkui/interface.c:3728
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 字元編碼 (預設為 iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
 msgid "Write ID3v2.4"
 msgstr "寫入 ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
 msgid "Content-Type Mapping"
-msgstr ""
+msgstr "目錄類型取代"
 
-#: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1002,91 +1035,100 @@ msgid ""
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
 msgid "Reset to defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
 msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+msgid ""
+"This dialog allows to set custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the "
+"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
 msgid "Artist / Album"
 msgstr "藝人 / 專輯"
 
-#: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
 msgid "Track No"
 msgstr "歌曲編號"
 
-#: ../plugins/gtkui/plcommon.c:556
-msgid "Add to playback queue"
-msgstr "加入至播放佇列"
+#: ../plugins/gtkui/plcommon.c:637
+msgid "Add To Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:561
-msgid "Remove from playback queue"
-msgstr "自播放佇列移除"
+#: ../plugins/gtkui/plcommon.c:642
+msgid "Remove From Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:569
-msgid "Reload metadata"
-msgstr "重讀元數據"
+#: ../plugins/gtkui/plcommon.c:650
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:587
-msgid "Remove from disk"
-msgstr "自磁碟移除"
+#: ../plugins/gtkui/plcommon.c:668
+msgid "Remove From Disk"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
 msgid "Add column"
 msgstr "加入欄位"
 
-#: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
 msgid "Edit column"
 msgstr "編輯欄位"
 
-#: ../plugins/gtkui/plcommon.c:1126
+#: ../plugins/gtkui/plcommon.c:1224
 msgid "Remove column"
 msgstr "移除欄位"
 
-#: ../plugins/gtkui/plcommon.c:1136
+#: ../plugins/gtkui/plcommon.c:1234
 msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1141
+#: ../plugins/gtkui/plcommon.c:1239
 msgid "Group by"
 msgstr "分組根據:"
 
-#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
+#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
 msgid "None"
 msgstr "無"
 
-#: ../plugins/gtkui/plcommon.c:1152
+#: ../plugins/gtkui/plcommon.c:1250
 msgid "Artist/Date/Album"
 msgstr "藝人/日期/專輯"
 
@@ -1103,11 +1145,11 @@ msgstr "設定 %s"
 msgid "Default Audio Device"
 msgstr "預設音訊裝置"
 
-#: ../plugins/gtkui/prefwin.c:346
+#: ../plugins/gtkui/prefwin.c:348
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin.c:350
 msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
@@ -1115,7 +1157,7 @@ msgstr ""
 msgid "Adding files..."
 msgstr "正在加入檔案..."
 
-#: ../plugins/gtkui/progress.c:86
+#: ../plugins/gtkui/progress.c:89
 msgid "Initializing..."
 msgstr "正在初始化..."
 
@@ -1128,139 +1170,141 @@ msgid "Really close the window?"
 msgstr "真要關閉視窗?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:289
+#: ../plugins/gtkui/trkproperties.c:299
 msgid "[Multiple values] "
 msgstr "[多重值] "
 
-#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
-#: ../plugins/gtkui/widgets.c:2025
+#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+#: ../plugins/gtkui/widgets.c:2200
 msgid "Key"
 msgstr "按鍵"
 
-#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
-#: ../plugins/gtkui/widgets.c:2027
+#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+#: ../plugins/gtkui/widgets.c:2202
 msgid "Value"
 msgstr "值"
 
-#: ../plugins/gtkui/trkproperties.c:512
+#: ../plugins/gtkui/trkproperties.c:522
 msgid "[Multiple values]"
-msgstr ""
+msgstr "[多重值]"
 
-#: ../plugins/gtkui/trkproperties.c:691
+#: ../plugins/gtkui/trkproperties.c:701
 msgid "Writing tags..."
 msgstr "正在寫入標記..."
 
-#: ../plugins/gtkui/trkproperties.c:720
+#: ../plugins/gtkui/trkproperties.c:730
 msgid "Field name"
-msgstr ""
+msgstr "欄位名稱"
 
-#: ../plugins/gtkui/trkproperties.c:723
+#: ../plugins/gtkui/trkproperties.c:733
 msgid "Name:"
 msgstr "名稱:"
 
-#: ../plugins/gtkui/trkproperties.c:735
+#: ../plugins/gtkui/trkproperties.c:745
 msgid "Field names must not start with : or _"
 msgstr "欄位名稱不能以 : 或 _ 開首"
 
-#: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
 msgid "Cannot add field"
 msgstr "無法加入欄位"
 
-#: ../plugins/gtkui/trkproperties.c:774
+#: ../plugins/gtkui/trkproperties.c:784
 msgid "Field with such name already exists, please try different name."
 msgstr "已有此名稱欄位,請選別個。"
 
-#: ../plugins/gtkui/trkproperties.c:837
+#: ../plugins/gtkui/trkproperties.c:847
 msgid "Add field"
 msgstr "加入欄位"
 
-#: ../plugins/gtkui/trkproperties.c:840
+#: ../plugins/gtkui/trkproperties.c:850
 msgid "Remove field"
 msgstr "移除欄位"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [--] [file(s)]\n"
-msgstr ""
+msgstr "使用方法: deadbeef [選項] [--] [檔案(複數)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "選項:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "   --help  or  -h     Print help (this message) and exit\n"
 msgstr "   --help  或  -h     顯示說明 (本訊息) 並結束\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid "   --quit             Quit player\n"
 msgstr "   --quit             結束播放器\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid "   --version          Print version info and exit\n"
 msgstr "   --version          顯示版本資料並結束\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid "   --play             Start playback\n"
 msgstr "   --play             開始播放\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid "   --stop             Stop playback\n"
 msgstr "   --stop             停止播放\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid "   --pause            Pause playback\n"
 msgstr "   --pause            暫停播放\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid "   --toggle-pause     Toggle pause\n"
 msgstr "   --toggle-pause     切換暫停狀態\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid ""
 "   --play-pause       Start playback if stopped, toggle pause otherwise\n"
 msgstr "   --play-pause       如停止則開始播放,否則切換暫停狀態\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid "   --next             Next song in playlist\n"
 msgstr "   --next             播放清單下一首歌\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid "   --prev             Previous song in playlist\n"
 msgstr "   --prev             播放清單上一首歌\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid "   --random           Random song in playlist\n"
 msgstr "   --random           播放清單隨機歌曲\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid "   --queue            Append file(s) to existing playlist\n"
 msgstr "   --queue            將檔案附加至播放清單\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid ""
 "   --gui PLUGIN       Tells which GUI plugin to use, default is \"GTK2\"\n"
 msgstr ""
+"   --gui 擴充  告訴程式您想使用哪個圖型介面擴充, 預設值是 \"GTK2\"\n"
+"\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid "   --nowplaying FMT   Print formatted track name to stdout\n"
 msgstr "   --nowplaying FMT   將格式化的歌曲名輸出至 stdout\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 "                      FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1271,7 +1315,7 @@ msgstr ""
 "                      [l]長度, [n]歌曲編號, [y]年份, [c]評語,\n"
 "                      [r]版權, [e]已過時間\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 "                      e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1280,28 +1324,24 @@ msgstr ""
 "                      例如: --nowplaying \"%%a - %%t\" 會顯示 \"藝人 - 歌名"
 "\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
-msgid ""
-"                      for more info, see http://sourceforge.net/apps/"
-"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgid "                      for more info, see %s\n"
 msgstr ""
-"                      更多資料請見 http://sourceforge.net/apps/mediawiki/"
-"deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:482 ../playlist.c:2489
+#: ../playlist.c:481 ../playlist.c:2557
 msgid "Default"
 msgstr "預設"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "Yes"
 msgstr "是"
 
-#: ../playlist.c:3877
+#: ../playlist.c:3981
 msgid "No"
 msgstr "否"
 
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1318,7 +1358,7 @@ msgstr ""
 "項目索引\n"
 "正在播放專輯封面藝人 - 專輯藝人專輯歌名長度歌曲編號樂隊 / 專輯藝人自訂"
 
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid ""
 "Left\n"
 "Right"
@@ -1326,7 +1366,7 @@ msgstr ""
 "左\n"
 "右"
 
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1335,7 +1375,7 @@ msgstr ""
 "停用\n"
 "歌曲專輯"
 
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:176
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1343,7 +1383,7 @@ msgstr ""
 "順序\n"
 "逆序"
 
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:188
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1351,14 +1391,7 @@ msgstr ""
 "2.3 (建議版本)\n"
 "2.4"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "找不 pixmap 檔案:%s"
-
-#: ../plugins/wildmidi/wildmidiplug.c:164
+#: ../plugins/wildmidi/wildmidiplug.c:174
 #, c-format
 msgid ""
 "wildmidi: freepats config file not found. Please install timidity-freepats "
@@ -1370,7 +1403,7 @@ msgstr ""
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
-msgid "Add audio CD"
+msgid "Add Audio CD"
 msgstr ""
 
 #: ../translation/extra.c:4
@@ -1417,7 +1450,7 @@ msgstr "Scrobble 網址"
 
 #: ../translation/extra.c:16
 msgid "Prefer Album Artist over Artist field"
-msgstr ""
+msgstr "以專輯作者取代作者欄"
 
 #. OSS output plugin
 #: ../translation/extra.c:18
@@ -1489,7 +1522,7 @@ msgstr "重取樣品質 (0..2,越高越好)"
 
 #: ../translation/extra.c:37
 msgid "8-bit output (default is 16)"
-msgstr ""
+msgstr "8-bit 輸出 (預設值是 16)"
 
 #. Game_Music_Emu decoder plugin
 #: ../translation/extra.c:39
@@ -1498,11 +1531,11 @@ msgstr "歌曲最大長度 (分鐘)"
 
 #: ../translation/extra.c:40
 msgid "Fadeout length (seconds)"
-msgstr ""
+msgstr "淡出長度 (單位:秒)"
 
 #: ../translation/extra.c:41
 msgid "Play loops nr. of times (if available)"
-msgstr ""
+msgstr "重複播放 數字 次 (若支援)"
 
 #. Standard GTK2 user interface plugin
 #: ../translation/extra.c:43
@@ -1655,7 +1688,7 @@ msgstr "目標取樣率"
 
 #: ../translation/extra.c:94
 msgid "Quality / Algorithm"
-msgstr ""
+msgstr "品質 / 演算法"
 
 #: ../translation/extra.c:95
 msgid "Automatic Samplerate (overrides Target Samplerate)"
@@ -1663,128 +1696,133 @@ msgstr "自動取樣率 (優先於「目標取樣率」)"
 
 #. shellexecui
 #: ../translation/extra.c:97
-msgid "Configure custom shell commands"
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
 #. mpgmad
 #: ../translation/extra.c:99
 msgid "Disable gapless playback (faster scanning)"
-msgstr ""
+msgstr "取消無間斷播放 (掃瞄更快速)"
 
 #. adplug
 #: ../translation/extra.c:101
 msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr ""
+msgstr "優先使用 Ken emu 取代 Satoh (環繞音效將無效)"
 
 #: ../translation/extra.c:102
 msgid "Enable surround"
+msgstr "開啟環繞音效"
+
+#: ../plugins/converter/convgui.c:84
+#, c-format
+msgid "[Built-in] %s"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:117
+#: ../plugins/converter/convgui.c:130
 msgid "The file already exists. Overwrite?"
 msgstr "已有該檔案。是否覆寫?"
 
-#: ../plugins/converter/convgui.c:119
+#: ../plugins/converter/convgui.c:132
 msgid "Converter warning"
 msgstr "轉換器警告"
 
-#: ../plugins/converter/convgui.c:287
+#: ../plugins/converter/convgui.c:300
 msgid "Please select encoder"
 msgstr "請選取編碼器"
 
-#: ../plugins/converter/convgui.c:289
+#: ../plugins/converter/convgui.c:302
 msgid "Converter error"
 msgstr "轉換器出錯"
 
-#: ../plugins/converter/convgui.c:313
+#: ../plugins/converter/convgui.c:326
 msgid "Converting..."
 msgstr "正在轉換..."
 
-#: ../plugins/converter/convgui.c:518
+#: ../plugins/converter/convgui.c:536
 msgid "Select folder..."
 msgstr "選取資料夾..."
 
-#: ../plugins/converter/convgui.c:740
+#: ../plugins/converter/convgui.c:769
 msgid "Failed to save encoder preset"
 msgstr "未能儲存編碼器預設值"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
 msgstr "檢查預設值資料夾權限、嘗試揀選另一個歌名,又或空出一些磁碟空間"
 
-#: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr "已有同名預設值。請揀選另一個。"
 
-#: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
 #: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
 #: ../plugins/gtkui/ctmapping.c:262
 msgid "Error"
 msgstr "錯誤"
 
-#: ../plugins/converter/convgui.c:797
+#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
 msgid "Add new encoder"
 msgstr "加入新編碼器"
 
-#: ../plugins/converter/convgui.c:827
+#: ../plugins/converter/convgui.c:856
 msgid "Edit encoder"
 msgstr "編輯編碼器"
 
-#: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
 msgid "Remove preset"
 msgstr "移除預設值"
 
-#: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "此舉會刪除所選預設值。確定嗎?"
 
-#: ../plugins/converter/convgui.c:885
+#: ../plugins/converter/convgui.c:974
 msgid "Encoders"
 msgstr "編碼器"
 
-#: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
 msgid "Add plugin to DSP chain"
 msgstr "將外掛程式加入至 DSP 連鎖"
 
-#: ../plugins/converter/convgui.c:1215
+#: ../plugins/converter/convgui.c:1323
 msgid "Failed to save DSP preset"
 msgstr "未能儲存 DSP 預設值"
 
-#: ../plugins/converter/convgui.c:1279
+#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
 msgid "New DSP Preset"
 msgstr "新增 DSP 預設值"
 
-#: ../plugins/converter/convgui.c:1364
+#: ../plugins/converter/convgui.c:1509
 msgid "Edit DSP Preset"
 msgstr "編輯 DSP 預設值"
 
-#: ../plugins/converter/convgui.c:1384
+#: ../plugins/converter/convgui.c:1529
 msgid "DSP Presets"
 msgstr "DSP 預設值"
 
-#: ../plugins/converter/interface.c:92
+#: ../plugins/converter/interface.c:93
 #: ../plugins/converter/converter.glade.h:1
 msgid "Output folder:"
 msgstr "輸出資料夾:"
 
-#: ../plugins/converter/interface.c:109
+#: ../plugins/converter/interface.c:110
 #: ../plugins/converter/converter.glade.h:2
 msgid "Write to source track folder"
-msgstr ""
+msgstr "寫入來源曲目資料夾"
 
-#: ../plugins/converter/interface.c:113
+#: ../plugins/converter/interface.c:114
 #: ../plugins/converter/converter.glade.h:3
 msgid "Preserve folder structure"
-msgstr ""
+msgstr "保持資料夾結構"
 
-#: ../plugins/converter/interface.c:121
+#: ../plugins/converter/interface.c:122
 #: ../plugins/converter/converter.glade.h:4
 msgid "Output file name:"
 msgstr "輸出檔案名稱:"
 
-#: ../plugins/converter/interface.c:132
+#: ../plugins/converter/interface.c:133
 #: ../plugins/converter/converter.glade.h:6
 #, no-c-format
 msgid ""
@@ -1794,89 +1832,89 @@ msgstr ""
 "會自動加上副檔名 (例如 .mp3)。\n"
 "留空使用預設值 (%a - %t)。"
 
-#: ../plugins/converter/interface.c:145
+#: ../plugins/converter/interface.c:146
 #: ../plugins/converter/converter.glade.h:8
 msgid "Encoder:"
 msgstr "編碼器:"
 
-#: ../plugins/converter/interface.c:169
+#: ../plugins/converter/interface.c:170
 #: ../plugins/converter/converter.glade.h:9
 msgid "DSP preset:"
 msgstr "DSP 預設值:"
 
-#: ../plugins/converter/interface.c:192
+#: ../plugins/converter/interface.c:193
 #: ../plugins/converter/converter.glade.h:10
 msgid "Number of threads:"
 msgstr "線程數目:"
 
-#: ../plugins/converter/interface.c:205
+#: ../plugins/converter/interface.c:206
 #: ../plugins/converter/converter.glade.h:11
 msgid "Output sample format:"
 msgstr "輸出取樣格式:"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:213
 msgid "Keep source format"
 msgstr "保持來源格式"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:214
 msgid "8 bit signed int"
 msgstr "8 位元帶正負整數"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:215
 msgid "16 bit signed int"
 msgstr "16 位元帶正負整數"
 
-#: ../plugins/converter/interface.c:215
+#: ../plugins/converter/interface.c:216
 msgid "24 bit signed int"
 msgstr "24 位元帶正負整數"
 
-#: ../plugins/converter/interface.c:216
+#: ../plugins/converter/interface.c:217
 msgid "32 bit signed int"
 msgstr "32 位元帶正負整數"
 
-#: ../plugins/converter/interface.c:217
+#: ../plugins/converter/interface.c:218
 msgid "32 bit float"
 msgstr "32 位元浮點數"
 
-#: ../plugins/converter/interface.c:223
+#: ../plugins/converter/interface.c:224
 #: ../plugins/converter/converter.glade.h:18
 msgid "When file exists:"
 msgstr "當有此檔案:"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:231
 msgid "Prompt"
 msgstr "提示"
 
-#: ../plugins/converter/interface.c:231
+#: ../plugins/converter/interface.c:232
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../plugins/converter/interface.c:362
+#: ../plugins/converter/interface.c:363
 #: ../plugins/converter/converter.glade.h:21
 msgid "Edit Encoder Preset"
 msgstr "編輯編碼器預設值"
 
-#: ../plugins/converter/interface.c:385
+#: ../plugins/converter/interface.c:386
 #: ../plugins/converter/converter.glade.h:23
 msgid "Untitled Encoder"
 msgstr "未命名編碼器"
 
-#: ../plugins/converter/interface.c:393
+#: ../plugins/converter/interface.c:394
 #: ../plugins/converter/converter.glade.h:24
 msgid "Output file extension:"
 msgstr "輸出檔案副檔名:"
 
-#: ../plugins/converter/interface.c:400
+#: ../plugins/converter/interface.c:401
 #: ../plugins/converter/converter.glade.h:25
 msgid "E.g. mp3"
 msgstr "例如 mp3"
 
-#: ../plugins/converter/interface.c:408
+#: ../plugins/converter/interface.c:409
 #: ../plugins/converter/converter.glade.h:26
 msgid "Command line:"
 msgstr "指令列:"
 
-#: ../plugins/converter/interface.c:419
+#: ../plugins/converter/interface.c:420
 #: ../plugins/converter/converter.glade.h:28
 #, no-c-format
 msgid ""
@@ -1886,7 +1924,7 @@ msgstr ""
 "例如: lame - %o\n"
 "%i 為輸入檔案、%o 為輸出檔案、- 為 stdin"
 
-#: ../plugins/converter/interface.c:429
+#: ../plugins/converter/interface.c:430
 #: ../plugins/converter/converter.glade.h:31
 #, no-c-format
 msgid ""
@@ -1896,66 +1934,72 @@ msgstr ""
 "<small>%o - 輸出檔案名稱\n"
 "%i - 臨時輸入檔案名稱</small>"
 
-#: ../plugins/converter/interface.c:438
+#: ../plugins/converter/interface.c:439
 #: ../plugins/converter/converter.glade.h:33
 msgid "Method:"
 msgstr "方法:"
 
-#: ../plugins/converter/interface.c:445
+#: ../plugins/converter/interface.c:446
 msgid "Pipe"
 msgstr "管線"
 
-#: ../plugins/converter/interface.c:446
+#: ../plugins/converter/interface.c:447
 msgid "Temporary file"
 msgstr "臨時檔案"
 
-#: ../plugins/converter/interface.c:463
+#: ../plugins/converter/interface.c:464
 #: ../plugins/converter/converter.glade.h:36
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:470
 #: ../plugins/converter/converter.glade.h:37
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:475
+#: ../plugins/converter/interface.c:476
 #: ../plugins/converter/converter.glade.h:38
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:481
+#: ../plugins/converter/interface.c:482
 #: ../plugins/converter/converter.glade.h:39
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:494
 #: ../plugins/converter/converter.glade.h:40
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:503
+#: ../plugins/converter/interface.c:504
 #: ../plugins/converter/converter.glade.h:41
 msgid "<b>Tag writer</b>"
 msgstr "<b>標記寫入器</b>"
 
-#: ../plugins/converter/interface.c:589
+#: ../plugins/converter/interface.c:590
 #: ../plugins/converter/converter.glade.h:42
 msgid "DSP Preset Editor"
 msgstr "DSP 預設值編輯"
 
-#: ../plugins/converter/interface.c:612
+#: ../plugins/converter/interface.c:613
 #: ../plugins/converter/converter.glade.h:44
 msgid "Untitled DSP Preset"
 msgstr "未命名 DSP 預設值"
 
-#: ../plugins/converter/interface.c:624
+#: ../plugins/converter/interface.c:625
 #: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:61
+#: ../plugins/shellexecui/interface.c:62
 #: ../plugins/shellexecui/shellexec.glade.h:3
 msgid "Add"
 msgstr "加入"
 
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "找不 pixmap 檔案:%s"
+
 #: ../plugins/converter/converter.glade.h:12
 msgid ""
 "Keep source format\n"
@@ -1965,45 +2009,55 @@ msgid ""
 "32 bit signed int\n"
 "32 bit float"
 msgstr ""
+"保持來源格式\n"
+"8 bit signed int\n"
+"16 bit signed int\n"
+"24 bit signed int\n"
+"32 bit signed int\n"
+"32 bit float"
 
 #: ../plugins/converter/converter.glade.h:19
 msgid ""
 "Prompt\n"
 "Overwrite"
 msgstr ""
+"立刻\n"
+"覆寫"
 
 #: ../plugins/converter/converter.glade.h:34
 msgid ""
 "Pipe\n"
 "Temporary file"
 msgstr ""
+"管道\n"
+"臨時檔案"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
-msgstr ""
+msgstr "自訂 Shell 指令"
 
-#: ../plugins/shellexecui/interface.c:69
+#: ../plugins/shellexecui/interface.c:70
 #: ../plugins/shellexecui/shellexec.glade.h:5
 msgid "Edit"
-msgstr ""
+msgstr "編輯(_E)"
 
-#: ../plugins/shellexecui/interface.c:87
+#: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
-msgstr ""
+msgstr "關閉(_C)"
 
-#: ../plugins/shellexecui/interface.c:145
+#: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
-msgstr ""
+msgstr "編輯指令"
 
-#: ../plugins/shellexecui/interface.c:166
+#: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
-msgstr ""
+msgstr "指令: "
 
-#: ../plugins/shellexecui/interface.c:178
+#: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
 #, no-c-format
 msgid ""
@@ -2012,74 +2066,74 @@ msgid ""
 "xdg-open %D"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:181
+#: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
-msgstr ""
+msgstr "ID:"
 
-#: ../plugins/shellexecui/interface.c:193
+#: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:201
+#: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
 "Command ID, normally it should be something short, for example \"youtube_open"
 "\". It must be unique."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:204
+#: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:207
+#: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:209
+#: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:212
+#: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:214
+#: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:217
+#: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:219
+#: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:222
+#: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:224
+#: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:227
+#: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:229
+#: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
 "<small>If you want to add the command to main menu, make sure that title "
@@ -2087,90 +2141,90 @@ msgid ""
 "menu name in the English version.</small>"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:94
+#: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
+#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
 msgid "Delete"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139
+#: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
+#: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:227
+#: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:233
+#: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:239
+#: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:246
-#: ../plugins/shellexecui/shellexecui.c:250
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:108
+#: ../plugins/gtkui/actionhandlers.c:112
 msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:119
+#: ../plugins/gtkui/actionhandlers.c:123
 msgid "All files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:127
+#: ../plugins/gtkui/actionhandlers.c:131
 msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:166
+#: ../plugins/gtkui/actionhandlers.c:170
 msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:212
+#: ../plugins/gtkui/actionhandlers.c:216
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:217
+#: ../plugins/gtkui/actionhandlers.c:221
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:429
+#: ../plugins/gtkui/actionhandlers.c:475
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:489
+#: ../plugins/gtkui/actionhandlers.c:548
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:490
+#: ../plugins/gtkui/actionhandlers.c:549
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:673
+#: ../plugins/gtkui/actionhandlers.c:726
 msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:688
+#: ../plugins/gtkui/actionhandlers.c:741
 msgid "Other files (*)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:722
+#: ../plugins/gtkui/actionhandlers.c:775
 msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:733
+#: ../plugins/gtkui/actionhandlers.c:786
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
@@ -2197,102 +2251,111 @@ msgstr ""
 msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:594
+#: ../plugins/gtkui/widgets.c:444
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:772
 msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:599
+#: ../plugins/gtkui/widgets.c:777
 msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:626
+#: ../plugins/gtkui/widgets.c:804
 msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:633
+#: ../plugins/gtkui/widgets.c:811
 msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:640
+#: ../plugins/gtkui/widgets.c:818
 msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:764
+#: ../plugins/gtkui/widgets.c:942
 msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1071
+#: ../plugins/gtkui/widgets.c:1249
 msgid "Lock movement"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1356
+#: ../plugins/gtkui/widgets.c:1534
 msgid "Move tab left"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1363
+#: ../plugins/gtkui/widgets.c:1541
 msgid "Move tab right"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1370
+#: ../plugins/gtkui/widgets.c:1548
 msgid "Remove tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1377
+#: ../plugins/gtkui/widgets.c:1555
 msgid "Rename tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1438
+#: ../plugins/gtkui/widgets.c:1616
 msgid "Add new tab"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1861
+#: ../plugins/gtkui/widgets.c:2036
 msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2969
+#: ../plugins/gtkui/widgets.c:3147
 msgid "Expand the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2974
+#: ../plugins/gtkui/widgets.c:3152
 msgid "Shrink the box by 1 item"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2979
+#: ../plugins/gtkui/widgets.c:3157
 msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3019
+#: ../plugins/gtkui/widgets.c:3197
 msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3027
+#: ../plugins/gtkui/widgets.c:3205
 msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/widgets.c:3606
 msgid "Configure button"
 msgstr ""
 
+#: ../plugins/gtkui/widgets.c:3870
+msgid "Voices:"
+msgstr ""
+
 #: ../plugins/gtkui/pltmenu.c:62
 msgid "Edit playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:258
+#: ../plugins/gtkui/pltmenu.c:265
 msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
+#: ../plugins/gtkui/pltmenu.c:272
 msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
+#: ../plugins/gtkui/pltmenu.c:279
 msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:225
+#: ../plugins/pltbrowser/pltbrowser.c:213
 msgid "Name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:251
+#: ../plugins/pltbrowser/pltbrowser.c:238
 msgid "Playlist browser"
 msgstr ""
diff --git a/premix.c b/premix.c
index 6da7ba0..1456078 100644
--- a/premix.c
+++ b/premix.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include "deadbeef.h"
 #include "premix.h"
-#include "optmath.h"
+#include "fastftoi.h"
 
 #define trace(...) { fprintf(stderr, __VA_ARGS__); }
 //#define trace(fmt,...)
diff --git a/strdupa.h b/strdupa.h
index b158f4d..d2c4a93 100644
--- a/strdupa.h
+++ b/strdupa.h
@@ -1,5 +1,28 @@
-#ifndef __DDB_PLATFORM_H
-#define __DDB_PLATFORM_H
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2014 Alexey Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __DDB_STRDUPA_H
+#define __DDB_STRDUPA_H
 
 #include <string.h>
 
diff --git a/streamer.c b/streamer.c
index f653361..2375c7f 100644
--- a/streamer.c
+++ b/streamer.c
@@ -41,7 +41,7 @@
 #include "messagepump.h"
 #include "conf.h"
 #include "plugins.h"
-#include "optmath.h"
+#include "fastftoi.h"
 #include "volume.h"
 #include "vfs.h"
 #include "premix.h"
@@ -83,6 +83,11 @@ static int autoconv_8_to_16 = 1;
 
 static int autoconv_16_to_24 = 0;
 
+static int trace_bufferfill = 0;
+
+static int stop_after_current = 0;
+static int stop_after_album = 0;
+
 static int streaming_terminate;
 
 // buffer up to 3 seconds at 44100Hz stereo
@@ -106,11 +111,12 @@ static int bytes_until_next_song = 0;
 static uintptr_t mutex;
 static uintptr_t decodemutex;
 static uintptr_t wdl_mutex; // wavedata listener
+
 static int nextsong = -1;
 static int nextsong_pstate = -1;
 static int badsong = -1;
 
-static float seekpos = -1;
+static float last_seekpos = -1;
 
 static float playpos = 0; // play position of current song
 static int avg_bitrate = -1; // avg bitrate of current song
@@ -128,7 +134,9 @@ static ddb_waveformat_t orig_output_format; // format that was requested before
 static int formatchanged;
 
 static DB_fileinfo_t *fileinfo;
+static DB_FILE *fileinfo_file;
 static DB_fileinfo_t *new_fileinfo;
+static DB_FILE *new_fileinfo_file;
 
 static int streamer_buffering;
 
@@ -178,23 +186,45 @@ streamer_unlock (void) {
 }
 
 static void
+streamer_set_nextsong_real (int song, int pstate);
+
+static int
+streamer_move_to_nextsong_real (int r);
+
+static int
+streamer_move_to_prevsong_real (int r);
+
+static int
+streamer_move_to_randomsong_real (int r);
+
+static void
+streamer_play_current_track_real (void);
+
+static void
+streamer_set_current_playlist_real (int plt);
+
+
+static void
 streamer_abort_files (void) {
+    DB_FILE *file = fileinfo_file;
+    DB_FILE *newfile = new_fileinfo_file;
+    DB_FILE *strfile = streamer_file;
     trace ("\033[0;33mstreamer_abort_files\033[37;0m\n");
-    mutex_lock (decodemutex);
-    if (fileinfo && fileinfo->file) {
-        deadbeef->fabort (fileinfo->file);
+    trace ("%p %p %p\n", file, newfile, strfile);
+
+    if (file) {
+        deadbeef->fabort (file);
     }
-    if (new_fileinfo && new_fileinfo->file) {
-        deadbeef->fabort (new_fileinfo->file);
+    if (newfile) {
+        deadbeef->fabort (newfile);
     }
-    if (streamer_file) {
-        deadbeef->fabort (streamer_file);
+    if (strfile) {
+        deadbeef->fabort (strfile);
     }
-    mutex_unlock (decodemutex);
-}
 
+}
 
-void
+static void
 streamer_set_replaygain (playItem_t *it) {
     // setup replaygain
     pl_lock ();
@@ -246,7 +276,7 @@ send_trackchanged (playItem_t *from, playItem_t *to) {
     messagepump_push_event ((ddb_event_t *)event, 0, 0);
 }
 
-void
+static void
 streamer_start_playback (playItem_t *from, playItem_t *it) {
     if (from) {
         pl_item_ref (from);
@@ -349,23 +379,91 @@ send_trackinfochanged (playItem_t *track) {
     messagepump_push_event ((ddb_event_t*)ev, 0, 0);
 }
 
-int
-streamer_move_to_nextsong (int reason) {
+static int
+stop_after_album_check (playItem_t *cur, playItem_t *next) {
+    if (!stop_after_album) {
+        return 0;
+    }
+
+    if (!cur) {
+        return 0;
+    }
+
+    if (!next) {
+        streamer_buffering = 0;
+        streamer_set_nextsong_real (-2, -2);
+        if (conf_get_int ("playlist.stop_after_album_reset", 0)) {
+            conf_set_int ("playlist.stop_after_album", 0);
+            stop_after_album = 0;
+            deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+        }
+        return 1;
+    }
+
+    const char *cur_artist = pl_find_meta_raw (cur, "artist");
+    const char *next_artist = pl_find_meta_raw (next, "artist");
+
+    const char *cur_album = pl_find_meta_raw (cur, "album");
+    const char *next_album = pl_find_meta_raw (next, "album");
+
+    const char *cur_aa = pl_find_meta_raw (cur, "band");
+    if (!cur_aa) {
+        cur_aa = pl_find_meta_raw (cur, "album artist");
+    }
+    if (!cur_aa) {
+        cur_aa = pl_find_meta_raw (cur, "albumartist");
+    }
+    const char *next_aa = pl_find_meta_raw (next, "band");
+    if (!next_aa) {
+        next_aa = pl_find_meta_raw (next, "album artist");
+    }
+    if (!next_aa) {
+        next_aa = pl_find_meta_raw (next, "albumartist");
+    }
+
+    if ((cur_artist == next_artist) && (cur_album == next_album) && (cur_aa == next_aa)) {
+        return 0;
+    }
+
+    streamer_buffering = 0;
+    streamer_set_nextsong_real (-2, -2);
+    if (conf_get_int ("playlist.stop_after_album_reset", 0)) {
+        conf_set_int ("playlist.stop_after_album", 0);
+        stop_after_album = 0;
+        deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+    }
+
+    return 1;
+}
+
+static int
+streamer_move_to_nextsong_real (int reason) {
+    if (reason) {
+        plug_get_output ()->stop ();
+    }
     trace ("streamer_move_to_nextsong (%d)\n", reason);
     pl_lock ();
     if (!streamer_playlist) {
         streamer_playlist = plt_get_curr ();
     }
+
+    playItem_t *curr = playlist_track;
+
     while (pl_playqueue_getcount ()) {
         trace ("pl_playqueue_getnext\n");
         playItem_t *it = pl_playqueue_getnext ();
         if (it) {
+            if (stop_after_album_check(curr, it)) {
+                pl_unlock ();
+                return -1;
+            }
+
             pl_playqueue_pop ();
             int r = str_get_idx_of (it);
             if (r >= 0) {
                 pl_item_unref (it);
                 pl_unlock ();
-                streamer_set_nextsong (r, 1);
+                streamer_set_nextsong_real (r, 1);
                 return 0;
             }
             else {
@@ -381,7 +479,7 @@ streamer_move_to_nextsong (int reason) {
                     if (r >= 0) {
                         pl_item_unref (it);
                         pl_unlock ();
-                        streamer_set_nextsong (r, 3);
+                        streamer_set_nextsong_real (r, 3);
                         return 0;
                     }
                 }
@@ -391,7 +489,6 @@ streamer_move_to_nextsong (int reason) {
         }
     }
 
-    playItem_t *curr = playlist_track;
     if (reason == 1) {
         if (streamer_playlist) {
             plt_unref (streamer_playlist);
@@ -406,7 +503,7 @@ streamer_move_to_nextsong (int reason) {
     playlist_t *plt = streamer_playlist;
     if (!plt->head[PL_MAIN]) {
         pl_unlock ();
-        streamer_set_nextsong (-2, 1);
+        streamer_set_nextsong_real (-2, 1);
         return 0;
     }
     int pl_order = pl_get_order ();
@@ -417,10 +514,10 @@ streamer_move_to_nextsong (int reason) {
         int r = str_get_idx_of (playing_track);
         pl_unlock ();
         if (r == -1) {
-            streamer_set_nextsong (-2, 1);
+            streamer_set_nextsong_real (-2, 1);
         }
         else {
-            streamer_set_nextsong (r, 1);
+            streamer_set_nextsong_real (r, 1);
         }
         return 0;
     }
@@ -438,6 +535,13 @@ streamer_move_to_nextsong (int reason) {
                 }
             }
             playItem_t *it = pmin;
+            // although it is possible that, although it == NULL, reshuffling the playlist
+            // will result in the next track belonging to the same album as this one, this
+            // is most likely not what the user wants.
+            if (stop_after_album_check(curr, it)) {
+                pl_unlock ();
+                return -1;
+            }
             if (!it) {
                 // all songs played, reshuffle and try again
                 if (pl_loop_mode == PLAYBACK_MODE_LOOP_ALL) { // loop
@@ -450,12 +554,12 @@ streamer_move_to_nextsong (int reason) {
                 playItem_t *temp;
                 plt_reshuffle (streamer_playlist, &temp, NULL);
                 pl_unlock ();
-                streamer_set_nextsong (-2, -2);
+                streamer_set_nextsong_real (-2, -2);
                 return -1;
             }
             int r = str_get_idx_of (it);
             pl_unlock ();
-            streamer_set_nextsong (r, 1);
+            streamer_set_nextsong_real (r, 1);
             return 0;
         }
         else {
@@ -472,6 +576,10 @@ streamer_move_to_nextsong (int reason) {
                 }
             }
             playItem_t *it = pmin;
+            if (stop_after_album_check(curr, it)) {
+                pl_unlock ();
+                return -1;
+            }
             if (!it) {
                 // all songs played, reshuffle and try again
                 if (pl_loop_mode == PLAYBACK_MODE_LOOP_ALL || reason == 1) { // loop
@@ -485,12 +593,12 @@ streamer_move_to_nextsong (int reason) {
                 playItem_t *temp;
                 plt_reshuffle (streamer_playlist, &temp, NULL);
                 pl_unlock ();
-                streamer_set_nextsong (-2, -2);
+                streamer_set_nextsong_real (-2, -2);
                 return -1;
             }
             int r = str_get_idx_of (it);
             pl_unlock ();
-            streamer_set_nextsong (r, 1);
+            streamer_set_nextsong_real (r, 1);
             return 0;
         }
     }
@@ -509,6 +617,10 @@ streamer_move_to_nextsong (int reason) {
         else {
             it = streamer_playlist->head[PL_MAIN];
         }
+        if (stop_after_album_check(curr, it)) {
+            pl_unlock ();
+            return -1;
+        }
         if (!it) {
             trace ("streamer_move_nextsong: was last track\n");
             if (pl_loop_mode == PLAYBACK_MODE_LOOP_ALL) {
@@ -519,7 +631,7 @@ streamer_move_to_nextsong (int reason) {
                 send_trackinfochanged (streaming_track);
                 badsong = -1;
                 pl_unlock ();
-                streamer_set_nextsong (-2, -2);
+                streamer_set_nextsong_real (-2, -2);
                 return 0;
             }
         }
@@ -529,15 +641,15 @@ streamer_move_to_nextsong (int reason) {
         }
         int r = str_get_idx_of (it);
         pl_unlock ();
-        streamer_set_nextsong (r, 1);
+        streamer_set_nextsong_real (r, 1);
         return 0;
     }
     else if (pl_order == PLAYBACK_ORDER_RANDOM) { // random
         pl_unlock ();
-        int res = streamer_move_to_randomsong ();
+        int res = streamer_move_to_randomsong_real (0);
         if (res == -1) {
             trace ("streamer_move_to_randomsong error\n");
-            streamer_set_nextsong (-2, 1);
+            streamer_set_nextsong_real (-2, 1);
             return -1;
         }
         return 0;
@@ -546,8 +658,11 @@ streamer_move_to_nextsong (int reason) {
     return -1;
 }
 
-int
-streamer_move_to_prevsong (void) {
+static int
+streamer_move_to_prevsong_real (int r) {
+    if (r) {
+        plug_get_output ()->stop ();
+    }
     pl_lock ();
     if (streamer_playlist) {
         plt_unref (streamer_playlist);
@@ -562,7 +677,7 @@ streamer_move_to_prevsong (void) {
     pl_playqueue_clear ();
     if (!plt->head[PL_MAIN]) {
         pl_unlock ();
-        streamer_set_nextsong (-2, 1);
+        streamer_set_nextsong_real (-2, 1);
         return 0;
     }
     int pl_order = conf_get_int ("playback.order", 0);
@@ -570,7 +685,7 @@ streamer_move_to_prevsong (void) {
     if (pl_order == PLAYBACK_ORDER_SHUFFLE_TRACKS || pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS) { // shuffle
         if (!playlist_track) {
             pl_unlock ();
-            return streamer_move_to_nextsong (1);
+            return streamer_move_to_nextsong_real (0);
         }
         else {
             playlist_track->played = 0;
@@ -609,12 +724,12 @@ streamer_move_to_prevsong (void) {
 
             if (!it) {
                 pl_unlock ();
-                streamer_set_nextsong (-2, 1);
+                streamer_set_nextsong_real (-2, 1);
                 return -1;
             }
             int r = str_get_idx_of (it);
             pl_unlock ();
-            streamer_set_nextsong (r, 1);
+            streamer_set_nextsong_real (r, 1);
             return 0;
         }
     }
@@ -637,19 +752,19 @@ streamer_move_to_prevsong (void) {
         }
         if (!it) {
             pl_unlock ();
-            streamer_set_nextsong (-2, 1);
+            streamer_set_nextsong_real (-2, 1);
             return -1;
         }
         int r = str_get_idx_of (it);
         pl_unlock ();
-        streamer_set_nextsong (r, 1);
+        streamer_set_nextsong_real (r, 1);
         return 0;
     }
     else if (pl_order == PLAYBACK_ORDER_RANDOM) { // random
         pl_unlock ();
-        int res = streamer_move_to_randomsong ();
+        int res = streamer_move_to_randomsong_real (0);
         if (res == -1) {
-            streamer_set_nextsong (-2, 1);
+            streamer_set_nextsong_real (-2, 1);
             trace ("streamer_move_to_randomsong error\n");
             return -1;
         }
@@ -659,8 +774,11 @@ streamer_move_to_prevsong (void) {
     return -1;
 }
 
-int
-streamer_move_to_randomsong (void) {
+static int
+streamer_move_to_randomsong_real (int reason) {
+    if (reason) {
+        plug_get_output ()->stop ();
+    }
     if (!streamer_playlist) {
         streamer_playlist = plt_get_curr ();
     }
@@ -679,12 +797,32 @@ streamer_move_to_randomsong (void) {
         }
     }
 
-    if (pl_get_order () == PLAYBACK_ORDER_SHUFFLE_ALBUMS) {
-        plt_init_shuffle_albums (plt, r);
+    streamer_set_nextsong_real (r, 1);
+    return 0;
+}
+
+int
+streamer_move_to_nextsong (int r) {
+    if (r) {
+        streamer_abort_files ();
     }
+    handler_push (handler, STR_EV_NEXT, 0, r, 0);
+}
 
-    streamer_set_nextsong (r, 1);
-    return 0;
+int
+streamer_move_to_prevsong (int r) {
+    if (r) {
+        streamer_abort_files ();
+    }
+    handler_push (handler, STR_EV_PREV, 0, r, 0);
+}
+
+int
+streamer_move_to_randomsong (int r) {
+    if (r) {
+        streamer_abort_files ();
+    }
+    handler_push (handler, STR_EV_RAND, 0, r, 0);
 }
 
 // playlist must call that whenever item was removed
@@ -798,6 +936,26 @@ ctmap_init (void) {
     }
 }
 
+static int
+is_remote_stream (playItem_t *it) {
+    int remote = 0;
+    pl_lock ();
+    const char *uri = pl_find_meta (it, ":URI");
+    if (uri && !plug_is_local_file (uri)) {
+        remote = 1;
+    }
+    pl_unlock ();
+    return remote;
+}
+
+static DB_fileinfo_t *dec_open (DB_decoder_t *dec, uint32_t hints, playItem_t *it) {
+    if (dec->plugin.api_vminor >= 7 && dec->open2) {
+        DB_fileinfo_t *fi = dec->open2 (hints, DB_PLAYITEM (it));
+        return fi;
+    }
+    return dec->open (hints);
+}
+
 // that must be called after last sample from str_playing_song was done reading
 static int
 streamer_set_current (playItem_t *it) {
@@ -816,6 +974,7 @@ streamer_set_current (playItem_t *it) {
         pl_item_ref (to);
     }
     trace ("\033[0;35mstreamer_set_current from %p to %p\033[37;0m\n", from, it);
+    trace ("\033[0;35moutput state: %d\033[37;0m\n", output->state ());
     if (!playing_track || output->state () == OUTPUT_STATE_STOPPED) {
         streamer_buffering = 1;
         trace ("\033[0;35mstreamer_start_playback[1] from %p to %p\033[37;0m\n", from, it);
@@ -830,8 +989,15 @@ streamer_set_current (playItem_t *it) {
         pl_item_unref (streaming_track);
         streaming_track = NULL;
     }
+
     mutex_unlock (decodemutex);
-    if (!it) {
+
+    int paused_stream = 0;
+    if (it && nextsong_pstate == 2) {
+        paused_stream = is_remote_stream (it);
+    }
+
+    if (!it || paused_stream) {
         goto success;
     }
     if (to) {
@@ -905,6 +1071,7 @@ streamer_set_current (playItem_t *it) {
             char *buf = NULL;
             int fd = -1;
             FILE *out = NULL;
+            char tempfile[1000] = "";
 
             int size = vfs_fgetlength (fp);
             if (size <= 0) {
@@ -921,7 +1088,6 @@ streamer_set_current (playItem_t *it) {
                 trace ("failed to download %d bytes (got %d bytes)\n", size, rd);
                 goto m3u_error;
             }
-            char tempfile[1000];
             const char *tmpdir = getenv ("TMPDIR");
             if (!tmpdir) {
                 tmpdir = "/tmp";
@@ -988,7 +1154,6 @@ streamer_set_current (playItem_t *it) {
                 pl_item_unref (i);
                 i = next;
             }
-            pl_item_unref ((playItem_t*)m3u);
             plt_free (plt);
             if (res == 0) {
                 // succeeded -- playing now
@@ -998,11 +1163,17 @@ streamer_set_current (playItem_t *it) {
                 if (to) {
                     pl_item_unref (to);
                 }
+                if (buf) {
+                    free (buf);
+                }
+                unlink (tempfile);
                 return res;
             }
-            unlink (tempfile);
 
 m3u_error:
+            if (*tempfile) {
+                unlink (tempfile);
+            }
             err = -1;
             if (buf) {
                 free (buf);
@@ -1094,13 +1265,18 @@ m3u_error:
 
         trace ("\033[0;33minit decoder for %s (%s)\033[37;0m\n", pl_find_meta (it, ":URI"), dec->plugin.id);
         mutex_lock (decodemutex);
-        new_fileinfo = dec->open (0);
+        new_fileinfo = dec_open (dec, 0, it);
+        if (new_fileinfo->file) {
+            new_fileinfo_file = new_fileinfo->file;
+        }
         mutex_unlock (decodemutex);
         if (new_fileinfo && dec->init (new_fileinfo, DB_PLAYITEM (it)) != 0) {
             trace ("\033[0;31mfailed to init decoder\033[37;0m\n");
+            pl_delete_meta (it, "!DECODER");
             mutex_lock (decodemutex);
             dec->free (new_fileinfo);
             new_fileinfo = NULL;
+            new_fileinfo_file = NULL;
             mutex_unlock (decodemutex);
         }
 
@@ -1110,6 +1286,7 @@ m3u_error:
         }
         else {
             mutex_lock (decodemutex);
+            new_fileinfo_file = new_fileinfo->file;
             if (streaming_track) {
                 pl_item_unref (streaming_track);
             }
@@ -1129,10 +1306,12 @@ success:
     if (fileinfo) {
         fileinfo->plugin->free (fileinfo);
         fileinfo = NULL;
+        fileinfo_file = NULL;
     }
     if (new_fileinfo) {
         fileinfo = new_fileinfo;
         new_fileinfo = NULL;
+        new_fileinfo_file = NULL;
     }
     mutex_unlock (decodemutex);
     if (do_songstarted && playing_track) {
@@ -1157,7 +1336,7 @@ error:
 
 float
 streamer_get_playpos (void) {
-    float seek = seekpos;
+    float seek = last_seekpos;
     if (seek >= 0) {
         return seek;
     }
@@ -1178,9 +1357,27 @@ streamer_get_apx_bitrate (void) {
 
 void
 streamer_set_nextsong (int song, int pstate) {
-    DB_output_t *output = plug_get_output ();
-    trace ("streamer_set_nextsong %d %d\n", song, pstate);
+//    pthread_t tid = pthread_self ();
+//    assert (tid != streamer_tid);
+    if (pstate == 0) {
+        // this is a stop query -- clear the queue
+        handler_reset (handler);
+    }
     streamer_abort_files ();
+    handler_push (handler, STR_EV_PLAY_TRACK_IDX, 0, song, pstate);
+}
+
+static void
+streamer_set_nextsong_real (int song, int pstate) {
+    DB_output_t *output = plug_get_output ();
+    if (pstate != 4) {
+        int n = 0;
+    }
+    trace ("\033[0;35mstreamer_set_nextsong %d %d\033[37;0m\n", song, pstate);
+    if (pstate == 4) {
+        pstate = 1;
+        output->stop ();
+    }
     streamer_lock ();
     nextsong = song;
     nextsong_pstate = pstate;
@@ -1196,12 +1393,15 @@ streamer_set_nextsong (int song, int pstate) {
         // no sense to wait until end of previous song, reset buffer
         bytes_until_next_song = 0;
         playpos = 0;
-        seekpos = -1;
+        last_seekpos = -1;
+    }
+    if (pl_get_order () == PLAYBACK_ORDER_SHUFFLE_ALBUMS) {
+        plt_init_shuffle_albums (streamer_playlist, song);
     }
     streamer_unlock ();
 }
 
-void
+static void
 streamer_set_generic_output_format (void) {
     output_format.bps = 16;
     output_format.is_float = 0;
@@ -1213,7 +1413,8 @@ streamer_set_generic_output_format (void) {
 
 void
 streamer_set_seek (float pos) {
-    seekpos = pos;
+    last_seekpos = pos;
+    handler_push (handler, STR_EV_SEEK, 0, *((uint32_t *)&pos), 0);
 }
 
 static void
@@ -1228,7 +1429,7 @@ streamer_start_new_song (void) {
     streamer_unlock ();
     if (badsong == sng) {
         trace ("looped to bad file. stopping...\n");
-        streamer_set_nextsong (-2, -2);
+        streamer_set_nextsong_real (-2, -2);
         badsong = -1;
         return;
     }
@@ -1264,8 +1465,8 @@ streamer_start_new_song (void) {
         trace ("\033[0;34mbadsong=%d\033[37;0m\n", badsong);
         // try jump to next song
         if (nextsong == -1) {
-            streamer_move_to_nextsong (0);
-            trace ("streamer_move_to_nextsong switched to track %d\n", nextsong);
+            trace ("streamer_move_to_nextsong after skip\n");
+            streamer_move_to_nextsong_real (1);
             usleep (50000);
         }
         else {
@@ -1300,7 +1501,7 @@ streamer_start_new_song (void) {
                 if (0 != output->play ()) {
                     memset (&orig_output_format, 0, sizeof (orig_output_format));
                     fprintf (stderr, "streamer: failed to start playback (start track)\n");
-                    streamer_set_nextsong (-2, 0);
+                    streamer_set_nextsong_real (-2, 0);
                 }
             }
         }
@@ -1318,28 +1519,30 @@ streamer_start_new_song (void) {
             if (0 != output->play ()) {
                 memset (&orig_output_format, 0, sizeof (orig_output_format));
                 fprintf (stderr, "streamer: failed to start playback (start track)\n");
-                streamer_set_nextsong (-2, 0);
+                streamer_set_nextsong_real (-2, 0);
             }
         }
         output->pause ();
     }
 }
 
-void
+static void
 streamer_next (int bytesread) {
     streamer_lock ();
     bytes_until_next_song = streamer_ringbuf.remaining + bytesread;
     streamer_unlock ();
-    if (conf_get_int ("playlist.stop_after_current", 0)) {
+    if (stop_after_current) {
         streamer_buffering = 0;
-        streamer_set_nextsong (-2, -2);
+        streamer_set_nextsong_real (-2, -2);
         if (conf_get_int ("playlist.stop_after_current_reset", 0)) {
             conf_set_int ("playlist.stop_after_current", 0);
+            stop_after_current = 0;
             deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
         }
     }
     else {
-        streamer_move_to_nextsong (0);
+        trace ("streamer_move_to_nextsong (0) called from streamer_next\n");
+        streamer_move_to_nextsong_real (0);
     }
 }
 
@@ -1350,10 +1553,41 @@ streamer_thread (void *ctx) {
 #endif
 
     while (!streaming_terminate) {
+        float seekpos = -1;
+
         struct timeval tm1;
         DB_output_t *output = plug_get_output ();
         gettimeofday (&tm1, NULL);
 
+        uint32_t id;
+        uintptr_t ctx;
+        uint32_t p1, p2;
+        if (!handler_pop (handler, &id, &ctx, &p1, &p2)) {
+            switch (id) {
+            case STR_EV_PLAY_TRACK_IDX:
+                streamer_set_nextsong_real (p1, p2);
+                break;
+            case STR_EV_PLAY_CURR:
+                streamer_play_current_track_real ();
+                break;
+            case STR_EV_NEXT:
+                streamer_move_to_nextsong_real (p1);
+                break;
+            case STR_EV_PREV:
+                streamer_move_to_prevsong_real (p1);
+                break;
+            case STR_EV_RAND:
+                streamer_move_to_randomsong_real (p1);
+                break;
+            case STR_EV_SEEK:
+                seekpos = *((float *)&p1);
+                break;
+            case STR_EV_SET_CURR_PLT:
+                streamer_set_current_playlist_real (p1);
+                break;
+            }
+        }
+
         if (nextsong >= 0) { // start streaming next song
             trace ("\033[0;34mnextsong=%d\033[37;0m\n", nextsong);
             if (playing_track) {
@@ -1361,6 +1595,9 @@ streamer_thread (void *ctx) {
                 send_songfinished (playing_track);
             }
             streamer_start_new_song ();
+            if (nextsong_pstate == 2) {
+                nextsong_pstate = -1;
+            }
             // it's totally possible that song was switched
             // while streamer_set_current was running,
             // so we need to restart here
@@ -1427,6 +1664,7 @@ streamer_thread (void *ctx) {
             avg_bitrate = -1;
             playlist_track = playing_track;
             playpos = 0;
+            last_seekpos = -1;
             seekpos = -1;
 
             // don't switch if unchanged
@@ -1440,11 +1678,10 @@ streamer_thread (void *ctx) {
             streamer_unlock ();
         }
 
-        int seek = seekpos;
-        if (seek >= 0) {
+        float seek = seekpos;
+        if (seek >= 0 && pl_get_item_duration (playing_track) > 0) {
             playpos = seek;
-            seekpos = -1;
-            trace ("seeking to %d\n", seek);
+            trace ("seeking to %f\n", seek);
             float pos = seek;
 
             if (playing_track != streaming_track) {
@@ -1456,6 +1693,7 @@ streamer_thread (void *ctx) {
                 if(fileinfo) {
                     fileinfo->plugin->free (fileinfo);
                     fileinfo = NULL;
+                    fileinfo_file = NULL;
                     pl_item_unref (streaming_track);
                     streaming_track = NULL;
                 }
@@ -1476,19 +1714,25 @@ streamer_thread (void *ctx) {
                 DB_decoder_t *dec = NULL;
                 pl_lock ();
                 const char *decoder_id = pl_find_meta (streaming_track, ":DECODER");
-                dec = plug_get_decoder_for_id (decoder_id);
+                if (decoder_id) {
+                    dec = plug_get_decoder_for_id (decoder_id);
+                }
                 pl_unlock ();
                 if (dec) {
-                    fileinfo = dec->open (0);
+                    fileinfo = dec_open (dec, 0, streaming_track);
                     mutex_unlock (decodemutex);
                     if (fileinfo && dec->init (fileinfo, DB_PLAYITEM (streaming_track)) != 0) {
                         mutex_lock (decodemutex);
                         dec->free (fileinfo);
                         fileinfo = NULL;
+                        fileinfo_file = NULL;
                         mutex_unlock (decodemutex);
                     }
                 }
                 else {
+                    if (fileinfo) {
+                        fileinfo_file = fileinfo->file;
+                    }
                     mutex_unlock (decodemutex);
                 }
 
@@ -1497,8 +1741,8 @@ streamer_thread (void *ctx) {
                         send_trackinfochanged (streaming_track);
                     }
                     trace ("failed to restart prev track on seek, trying to jump to next track\n");
+                    trace ("streamer_move_to_nextsong from seek\n");
                     streamer_move_to_nextsong (0);
-                    trace ("streamer_move_to_nextsong switched to track %d\n", nextsong);
                     usleep (50000);
                     continue;
                 }
@@ -1533,6 +1777,7 @@ streamer_thread (void *ctx) {
             ev->playpos = playpos;
             messagepump_push_event ((ddb_event_t*)ev, 0, 0);
         }
+        last_seekpos = -1;
 
         // read ahead at 2x speed of output samplerate, in 4k blocks
         int rate = output->fmt.samplerate;
@@ -1543,7 +1788,17 @@ streamer_thread (void *ctx) {
         }
         int channels = output->fmt.channels;
         int bytes_in_one_second = rate * (output->fmt.bps>>3) * channels;
-        const int blocksize = MIN_BLOCK_SIZE;
+        int blocksize = bytes_in_one_second / 120;
+
+        if (blocksize < MIN_BLOCK_SIZE) {
+            blocksize = MIN_BLOCK_SIZE;
+        }
+        else if (blocksize > MAX_BLOCK_SIZE) {
+            blocksize = MAX_BLOCK_SIZE;
+        }
+
+        blocksize &= ~3; // 4byte alignment is required
+
         int alloc_time = 1000 / (bytes_in_one_second / blocksize);
 
         int skip = 0;
@@ -1600,7 +1855,9 @@ streamer_thread (void *ctx) {
                 ringbuf_write (&streamer_ringbuf, readbuffer, bytesread);
             }
 
-            //trace ("fill: %d, read: %d, size=%d, blocksize=%d\n", streamer_ringbuf.remaining, bytesread, STREAM_BUFFER_SIZE, blocksize);
+            if (trace_bufferfill >= 1) {
+                fprintf (stderr, "fill: %d, read: %d, size=%d, blocksize=%d\n", (int)streamer_ringbuf.remaining, (int)bytesread, (int)STREAM_BUFFER_SIZE, (int)blocksize);
+            }
         }
         streamer_unlock ();
         if ((streamer_ringbuf.remaining > 128000 && streamer_buffering) || !streaming_track) {
@@ -1613,14 +1870,28 @@ streamer_thread (void *ctx) {
         gettimeofday (&tm2, NULL);
 
         int ms = (tm2.tv_sec*1000+tm2.tv_usec/1000) - (tm1.tv_sec*1000+tm1.tv_usec/1000);
-        //trace ("slept %dms (alloc=%dms, bytespersec=%d, chan=%d, blocksize=%d), fill: %d/%d (cursor=%d)\n", alloc_time-ms, alloc_time, bytes_in_one_second, output->fmt.channels, blocksize, streamer_ringbuf.remaining, STREAM_BUFFER_SIZE, streamer_ringbuf.cursor);
+        if (trace_bufferfill >= 2) {
+            fprintf (stderr, "slept %dms (alloc=%dms, bytespersec=%d, chan=%d, blocksize=%d), fill: %d/%d (cursor=%d)\n", (int)(alloc_time-ms), (int)alloc_time, (int)bytes_in_one_second, output->fmt.channels, blocksize, (int)streamer_ringbuf.remaining, STREAM_BUFFER_SIZE, (int)streamer_ringbuf.cursor);
+        }
 
         // add 1ms here to compensate the rounding error
         // and another 1ms to buffer slightly faster then playing
         alloc_time -= ms+2;
-        if (!streamer_buffering && alloc_time > 0) {
+        if (streamer_buffering) {
+            alloc_time = 0;
+        }
+        else if (streamer_ringbuf.remaining < STREAM_BUFFER_SIZE / 2) {
+            alloc_time >>= 2; // speed-up loading a little
+        }
+
+        //printf ("sleep: %d, buffering: %d, buffer_starving: %d (%d/%d)\n", alloc_time, streamer_buffering, streamer_ringbuf.remaining < STREAM_BUFFER_SIZE / 2, streamer_ringbuf.remaining, STREAM_BUFFER_SIZE / 2);
+
+        if (alloc_time > 0) {
             usleep (alloc_time * 1000);
         }
+        else if (bytes_until_next_song > 0) {
+            usleep (20000);
+        }
     }
 
     // stop streaming song
@@ -1628,6 +1899,7 @@ streamer_thread (void *ctx) {
     if (fileinfo) {
         fileinfo->plugin->free (fileinfo);
         fileinfo = NULL;
+        fileinfo_file = NULL;
     }
     if (streaming_track) {
         pl_item_unref (streaming_track);
@@ -1780,7 +2052,7 @@ streamer_dsp_chain_save (void) {
     return streamer_dsp_chain_save_internal (fname, dsp_chain);
 }
 
-void
+static void
 streamer_dsp_postinit (void) {
     // note about EQ hack:
     // we 1st check if there's an EQ in dsp chain, and just use it
@@ -1839,7 +2111,7 @@ streamer_dsp_refresh (void) {
     mutex_unlock (decodemutex);
 }
 
-void
+static void
 streamer_dsp_init (void) {
     // load dsp chain from file
     char fname[PATH_MAX];
@@ -1990,7 +2262,7 @@ streamer_set_output_format (void) {
     DB_output_t *output = plug_get_output ();
     int playing = (output->state () == OUTPUT_STATE_PLAYING);
 
-//    fprintf (stderr, "streamer_set_output_format %dbit %s %dch %dHz channelmask=%X, bufferfill: %d\n", output_format.bps, output_format.is_float ? "float" : "int", output_format.channels, output_format.samplerate, output_format.channelmask, streamer_ringbuf.remaining);
+    trace ("streamer_set_output_format %dbit %s %dch %dHz channelmask=%X, bufferfill: %d\n", output_format.bps, output_format.is_float ? "float" : "int", output_format.channels, output_format.samplerate, output_format.channelmask, streamer_ringbuf.remaining);
     ddb_waveformat_t fmt;
     memcpy (&fmt, &output_format, sizeof (ddb_waveformat_t));
     if (autoconv_8_to_16) {
@@ -2009,7 +2281,7 @@ streamer_set_output_format (void) {
         if (0 != output->play ()) {
             memset (&output_format, 0, sizeof (output_format));
             fprintf (stderr, "streamer: failed to start playback (streamer_read format change)\n");
-            streamer_set_nextsong (-2, 0);
+            streamer_set_nextsong_real (-2, 0);
             return -1;
         }
     }
@@ -2218,9 +2490,14 @@ streamer_read_async (char *bytes, int size) {
         // that means EOF
         // trace ("streamer: EOF! buns: %d, bytesread: %d, buffering: %d, bufferfill: %d\n", bytes_until_next_song, bytesread, streamer_buffering, streamer_ringbuf.remaining);
 
-        // in case of decoder error, or EOF while buffering - switch to next song instantly
-        if (bytesread < 0 || (bytes_until_next_song >= 0 && streamer_buffering && bytesread == 0) || bytes_until_next_song < 0) {
-            trace ("finished streaming song, queueing next (%d %d %d %d)\n", bytesread, bytes_until_next_song, streamer_buffering, nextsong_pstate);
+        // EOF or error while buffering -- stop buffering
+        if (bytesread <= 0 && bytes_until_next_song >= 0 && streamer_buffering) {
+            streamer_buffering = 0;
+            return bytesread;
+        }
+
+        // if track finished playing -- go to next
+        if (bytes_until_next_song < 0) {
             streamer_next (bytesread);
         }
     }
@@ -2405,7 +2682,7 @@ streamer_read (char *bytes, int size) {
     return sz;
 }
 
-int
+static int
 streamer_get_fill (void) {
     return streamer_ringbuf.remaining;
 }
@@ -2446,6 +2723,11 @@ streamer_configchanged (void) {
         streamer_reset (1);
     }
 
+    trace_bufferfill = conf_get_int ("streamer.trace_buffer_fill",0);
+
+    stop_after_current = conf_get_int ("playlist.stop_after_current", 0);
+    stop_after_album = conf_get_int ("playlist.stop_after_album", 0);
+
     char mapstr[2048];
     deadbeef->conf_get_str ("network.ctmapping", DDB_DEFAULT_CTMAPPING, mapstr, sizeof (mapstr));
     if (strcmp (mapstr, conf_network_ctmapping)) {
@@ -2453,11 +2735,21 @@ streamer_configchanged (void) {
     }
 }
 
-void
-streamer_play_current_track (void) {
+static void
+streamer_play_current_track_real (void) {
     playlist_t *plt = plt_get_curr ();
     DB_output_t *output = plug_get_output ();
     if (output->state () == OUTPUT_STATE_PAUSED && playing_track) {
+        if (is_remote_stream (playing_track)) {
+            streamer_reset (1);
+            streamer_set_current (NULL);
+            streamer_set_current (playing_track);
+            if (fileinfo && memcmp (&orig_output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t))) {
+                memcpy (&output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t));
+                memcpy (&orig_output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t));
+                streamer_set_output_format ();
+            }
+        }
         // unpause currently paused track
         output->unpause ();
         messagepump_push (DB_EV_PAUSED, 0, 0, 0);
@@ -2477,7 +2769,7 @@ streamer_play_current_track (void) {
             idx = plt->current_row[PL_MAIN];
         }
 
-        streamer_set_nextsong (idx, 1);
+        streamer_set_nextsong_real (idx, 1);
         pl_lock ();
         if (streamer_playlist) {
             plt_unref (streamer_playlist);
@@ -2495,13 +2787,18 @@ streamer_play_current_track (void) {
     }
 }
 
+void
+streamer_play_current_track (void) {
+    handler_push (handler, STR_EV_PLAY_CURR, 0, 0, 0);
+}
+
 struct DB_fileinfo_s *
 streamer_get_current_fileinfo (void) {
     return fileinfo;
 }
 
-void
-streamer_set_current_playlist (int plt) {
+static void
+streamer_set_current_playlist_real (int plt) {
     pl_lock ();
     if (streamer_playlist) {
         plt_unref (streamer_playlist);
@@ -2510,6 +2807,11 @@ streamer_set_current_playlist (int plt) {
     pl_unlock ();
 }
 
+void
+streamer_set_current_playlist (int plt) {
+    handler_push (handler, STR_EV_SET_CURR_PLT, 0, plt, 0);
+}
+
 int
 streamer_get_current_playlist (void) {
     pl_lock ();
diff --git a/streamer.h b/streamer.h
index 5bbfd9b..6526446 100644
--- a/streamer.h
+++ b/streamer.h
@@ -30,6 +30,17 @@
 #include "playlist.h"
 #include "deadbeef.h"
 
+// events to pass to streamer thread
+enum {
+    STR_EV_PLAY_TRACK_IDX, // p1 = idx, p2 = pstate; see streamer_set_nextsong semantics
+    STR_EV_PLAY_CURR, // will play the current streamer track (playing_track), see more details in streamer_play_current_track
+    STR_EV_NEXT, // streamer_move_to_nextsong
+    STR_EV_PREV, // streamer_move_to_prevsong
+    STR_EV_RAND, // streamer_move_to_randomsong
+    STR_EV_SEEK, // streamer_set_seek; p1: float pos
+    STR_EV_SET_CURR_PLT, // streamer_set_current_playlist
+};
+
 int
 streamer_init (void);
 
@@ -55,6 +66,7 @@ streamer_unlock (void);
 // 1 switch to current (gui) playlist, play if not playing
 // 2 pause
 // 3 play if not playing, don't switch playlist
+// 4 same as 1, but stops playback before proceeding
 void
 streamer_set_nextsong (int song, int pstate);
 
@@ -62,9 +74,6 @@ void
 streamer_set_seek (float pos);
 
 int
-streamer_get_fill (void);
-
-int
 streamer_ok_to_read (int len);
 
 float
@@ -82,6 +91,9 @@ streamer_get_playing_track (void);
 void
 streamer_configchanged (void);
 
+// if paused -- resume
+// else, if have cursor track -- stop current, play cursor
+// else, play next
 void
 streamer_play_current_track (void);
 
@@ -92,15 +104,15 @@ int
 streamer_get_apx_bitrate (void);
 
 // returns -1 if theres no next song, or playlist finished
-// reason 0 means "song finished", 1 means "user clicked next"
+// reason 0 means "prev song finished", 1 means "interrupt"
 int
-streamer_move_to_nextsong (int reason);
+streamer_move_to_nextsong (int r);
 
 int
-streamer_move_to_prevsong (void);
+streamer_move_to_prevsong (int r);
 
 int
-streamer_move_to_randomsong (void);
+streamer_move_to_randomsong (int r);
 
 struct DB_fileinfo_s *
 streamer_get_current_fileinfo (void);
@@ -130,9 +142,6 @@ streamer_dsp_refresh (void);
 void
 streamer_get_output_format (ddb_waveformat_t *fmt);
 
-void
-streamer_dsp_postinit (void);
-
 int
 streamer_dsp_chain_save (void);
 
diff --git a/translation/extra.c b/translation/extra.c
index 844e39d..e40965a 100644
--- a/translation/extra.c
+++ b/translation/extra.c
@@ -1,6 +1,6 @@
 // this file should list extra translatable strings that are not referenced
 // directly in source code, e.g. scripted plugin configuration strings
-_("Add audio CD")
+_("Add Audio CD")
 _("Lookup on Last.fm")
 // ALSA output plugin
 _("Use ALSA resampling")
@@ -94,7 +94,7 @@ _("Target Samplerate")
 _("Quality / Algorithm")
 _("Automatic Samplerate (overrides Target Samplerate)")
 // shellexecui
-_("Configure custom shell commands")
+_("Configure Custom Shell Commands")
 // mpgmad
 _("Disable gapless playback (faster scanning)")
 // adplug
diff --git a/translation/help.pt_BR.txt b/translation/help.pt_BR.txt
index 37da01d..6c7af44 100644
--- a/translation/help.pt_BR.txt
+++ b/translation/help.pt_BR.txt
@@ -3,8 +3,8 @@ arquivo de ajuda para o tocador DeaDBeeF
 * LINKS
 
     website: http://deadbeef.sf.net
-    wiki: http://sf.net/apps/mediawiki/deadbeef
-    website de desenvolvimento: http://sf.net/projects/deadbeef
+    wiki: http://github.com/Alexey-Yakovenko/deadbeef/wiki
+    website de desenvolvimento: http://github.com/Alexey-Yakovenko/deadbeef
     info para contribuintes: http://contributing.appspot.com/deadbeef
 
 * ATALHOS DE TECLADO ÚTEIS
diff --git a/translation/help.ru.txt b/translation/help.ru.txt
index ebc42d3..18ac1b8 100644
--- a/translation/help.ru.txt
+++ b/translation/help.ru.txt
@@ -3,8 +3,8 @@
 * ССЫЛКИ
 
     официальный сайт: http://deadbeef.sf.net
-    справка: http://sf.net/apps/mediawiki/deadbeef
-    ресурсы для разработчиков: http://sf.net/projects/deadbeef
+    wiki: http://github.com/Alexey-Yakovenko/deadbeef/wiki
+    ресурсы для разработчиков: http://github.com/Alexey-Yakovenko/deadbeef
     информация для спонсоров: http://contributing.appspot.com/deadbeef
 
 * ПОЛЕЗНЫЕ СОЧЕТАНИЯ КЛАВИШ
diff --git a/translators.txt b/translators.txt
index 60998e2..7ad6823 100644
--- a/translators.txt
+++ b/translators.txt
@@ -103,6 +103,8 @@ Romanian
  Mișu Moldovan <dumol at xfce.org>
 
 Russian
+ Alexey Yakovenko <wakeroid at gmail.com>
+ Andrei Stepanov
  Dmitriy Simbiriatin <slpiv at mail.ru>
 
 Sinhala

-- 
deadbeef packaging



More information about the pkg-multimedia-commits mailing list